Merge branch 'v0.11' into stable

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

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