From: Weblate <noreply@weblate.org>
Date: Thu, 19 Jan 2017 18:50:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.2.0~32
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/e5cee2437ca82dfbe96fa696a4a775689ceae10f?hp=6c49d9981c96cdd5d931cbd1eeb5cc584c1370ab

Merge remote-tracking branch 'origin/master'
---

diff --git a/README.md b/README.md
index a4fba91..73f943b 100644
--- a/README.md
+++ b/README.md
@@ -273,3 +273,17 @@ The very first version of Jirafeau after the fork of Jyraphe.
 5. Follow installation wizard, it should propose you the same data folder
 6. Add a rewrite rule in your web server configuration to rename file.php to f.php to make old url work again
 7. Go in you lib/config.local.php and lib/config.original.php to check new options and eventually change skin to 'courgette'
+
+## Version 1.2.0
+
+- Change versioning semantic
+- A lof of translation contributions
+- Fix javascript MIME type
+- Show download in admin panel
+- Default expiration date set to 'month'
+- New expiration date: 'quarter'
+- Small other fixes
+
+### Update from 1.1 to 1.2.0
+
+Nothing particular, just make a backup of your installation before updating.
diff --git a/lib/settings.php b/lib/settings.php
index bd71f59..3a9f450 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -19,7 +19,7 @@
 
 /* Jirafeau constants */
 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
-define ('JIRAFEAU_VERSION', '1.1');
+define ('JIRAFEAU_VERSION', '1.2.0');
 
 /* Directories. */
 define ('VAR_FILES', $cfg['var_root'] . 'files/');