From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 12 Nov 2020 12:02:36 +0000 (+0100)
Subject: Merge branch 'master' into v0.12
X-Git-Tag: v0.12.1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=refs%2Ftags%2Fv0.12.1;hp=a6935feb22df8d9634189ee87d257da9f03eedbd;p=github%2Fshaarli%2FShaarli.git

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

diff --git a/shaarli_version.php b/shaarli_version.php
index 9167b43e..4aa5e992 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* dev */ ?>
+<?php /* 0.12.1 */ ?>