Merge remote-tracking branch 'origin/master'

diff --git a/README.md b/README.md
index a4fba91a6527a9631159d87a5248bf39accd21ea..73f943becbb03c1c1b3f7cd69b7ccd41eafd5c7f 100644 (file)
--- 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 bd71f59f2c76c1887314de321765180cf8dea706..3a9f450172471d1b9feb3a3216791145c387bc9b 100644 (file)
--- 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/');