Merge branch 'master' into v0.12

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

diff --git a/shaarli_version.php b/shaarli_version.php
index 17f5ffabf2389f9dc4c3778faeb1fb6c3b87498f..4aa5e99235063518d8fb9a5eb9d6f8d5247422f5 100644 (file)
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.5.4 */ ?>
+<?php /* 0.12.1 */ ?>