Merge remote-tracking branch 'parent/master' into v0.12

[github/shaarli/Shaarli.git] / shaarli_version.php

diff --git a/shaarli_version.php b/shaarli_version.php
index 11ad87d7c52814896a0ca255b2e33d9a5b2a3d08..79f7514a28de50408147ccf01a027925b25fa812 100644 (file)
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.6.1 */ ?>
+<?php /* 0.12.0-beta-2 */ ?>