From: Weblate <noreply@weblate.org>
Date: Thu, 19 Jan 2017 19:36:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.2.0~30
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/8f0c2200cade5e8de81962f71fdaba3457e551f5?hp=9e4d7b5f220d21aa832f88efd784e8f464eb5384

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

diff --git a/README.md b/README.md
index 76f60a2..9a09bd3 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,10 @@ If you don't want to go through the installation wizard, you can just copy ```co
 
 Nothing particular
 
+### from version 1.2.0 to 2.0.0.
+
+1. ToS text file changed → move file from "/tos_text.php" to "/lib/tos.local.txt" and remove all HTML and PHP Tags, leaving a regular text file
+
 ## Security
 
 ```var``` directory contain all files and links. It is randomly named to limit access but you may add better protection to prevent un-authorized access to it.
@@ -320,3 +324,14 @@ The very first version of Jirafeau after the fork of Jyraphe.
 - Default expiration date set to 'month'
 - New expiration date: 'quarter'
 - Small other fixes
+
+## Version 2.0.0
+
+- ToS refactoring (see update notes !)
+- You can now set a title to Jirafeau in options
+- A lot of documentation improvements
+- Code refactoring & bugfixes
+- Add version to bash script
+- A lot of documentation improvements
+- Code refactoring & bug fixes
+- 
diff --git a/lib/settings.php b/lib/settings.php
index 3167414..d619637 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -32,7 +32,7 @@ if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php'))
 
 /* Jirafeau constants */
 define ('JIRAFEAU_PACKAGE', 'Jirafeau');
-define ('JIRAFEAU_VERSION', '1.2.0');
+define ('JIRAFEAU_VERSION', '2.0.0');
 
 /* Directories. */
 define ('VAR_FILES', $cfg['var_root'] . 'files/');