Merge tag 'v0.12.1' into latest

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

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