From a793f57ef018e623cd2c5f66a68f839e131fed7d Mon Sep 17 00:00:00 2001
From: Jerome Jutteau <jerome@jutteau.fr>
Date: Fri, 22 Nov 2019 23:10:03 +0100
Subject: [PATCH 1/1] Jirafeau version 4.1.0

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>
---
 README.md        | 17 ++++++++++++++++-
 lib/settings.php |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2c850e4..4ef315b 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ Installation steps:
 1. The "Terms of Service" text file changed
    * To reuse previous changes to the ToS, move the old ```/tos_text.php``` file to ```/lib/tos.local.txt``` and remove all HTML und PHP Tags, leaving a regular text file
 
-### from version 2.0.0 to 3.4.1
+### From version 2.0.0 to 3.4.1
 
 There is nothing special to do to update from/to the following versions:
 - 2.0.0 -> 3.0.0
@@ -128,6 +128,11 @@ find files -type f ! -name "*_count" | while read f; do bn="$(basename "$f")"; d
 find links -type f | while read link; do bn="$(basename "$link")"; mkdir "links/$bn"; mv "$link" "links/$bn/"; done; find links -maxdepth 1 -type d -iname "?" -exec rm -rf {} \;
 ```
 
+### From 4.0.0 to 4.1.0
+
+There is nothing special to do to update from/to the following versions:
+- 4.0.0 -> 4.1.0
+
 ### Troubleshooting
 
 If you have some troubles, consider the following cases
@@ -460,3 +465,13 @@ The very first version of Jirafeau after the fork of Jyraphe.
 - Bugfix with LibreJS
 - Other minor bug fixes
 - More languages supported
+
+## Version 4.1.0
+
+- Fix upload password and allowed ip (#201)
+- Code refactorisation of IP checking
+- Fix expiration dates
+- Add better support for Accept-Language
+- Cosmetic fixes
+- More languages supported and language fixes
+
diff --git a/lib/settings.php b/lib/settings.php
index 17df61e..fa7a732 100644
--- 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', '4.0.0');
+define('JIRAFEAU_VERSION', '4.1.0');
 
 /* Directories. */
 define('VAR_FILES', $cfg['var_root'] . 'files/');
-- 
2.34.1