Merge remote-tracking branch 'origin/master'

diff --git a/README.md b/README.md
index 2e7127d25efb031ad1e140db6b85de3ee303001d..45bb71233fbd8a09b6d24b44172b230f3816d116 100644 (file)
--- a/README.md
+++ b/README.md
@@ -98,6 +98,10 @@ Installation steps:
 
 1. No special change to upgrade to 3.0.0
 
+### From version 2.0.0 to 3.1.0
+
+1. No special change to upgrade to 3.1.0
+
 ### Troubleshooting
 
 If you have some troubles, consider the following cases
@@ -370,3 +374,8 @@ The very first version of Jirafeau after the fork of Jyraphe.
 - Set UTC as timezone to prevent date/time issues
 - Show readable date & time information
 - Fix UI glitches in admin panel and upload form
+
+## Version 3.1.0
+
+- Fix regression on user authentication (see #113)
+- Some cosmetic change

diff --git a/lib/settings.php b/lib/settings.php
index 4a36f4fe275fdfc680ecd9e4137652b422a3e192..6f169405b860e2954dde071c57f70da4e6e2d509 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -33,7 +33,7 @@ if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
-define('JIRAFEAU_VERSION', '3.0.0');
+define('JIRAFEAU_VERSION', '3.1.0');
 
 /* Directories. */
 define('VAR_FILES', $cfg['var_root'] . 'files/');