From: VirtualTam <virtualtam@flibidi.net>
Date: Tue, 22 Aug 2017 23:08:41 +0000 (+0200)
Subject: Merge branch 'master' into v0.9
X-Git-Tag: v0.9.1~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9d7a02afcee3c740712a7c95182d332db0504b7e;hp=7c2460c856c1d561b8347316f3045208f9f3d24e;p=github%2Fshaarli%2FShaarli.git

Merge branch 'master' into v0.9
---

diff --git a/shaarli_version.php b/shaarli_version.php
index 9167b43e..148bc431 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* dev */ ?>
+<?php /* 0.9.0 */ ?>