Merge branch 'master' into v0.12

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

diff --git a/shaarli_version.php b/shaarli_version.php
old mode 100755 (executable)
new mode 100644 (file)
index b843a5b..4aa5e99
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.5.3 */ ?>
+<?php /* 0.12.1 */ ?>