Merge branch 'v0.11' into stable

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

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