From 57705c679b56b0f9eb5c343fd24f15fc80926b5b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Wed, 31 Aug 2016 15:56:07 +0200
Subject: Start 1.6.0-dev

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'constants.php')

diff --git a/constants.php b/constants.php
index 80a22c8f0..2a8486ad1 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.5.0');
+define('FRESHRSS_VERSION', '1.6.0-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From 29e1f048159b7a580bdf1bab184e928f11d104b4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 30 Oct 2016 20:13:37 +0100
Subject: Prepare master 1.6.0 release

https://github.com/FreshRSS/FreshRSS/issues/1328
---
 CHANGELOG.md  | 2 +-
 constants.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'constants.php')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e89daf76..461949128 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-10-XX FreshRSS 1.6.0-dev
+## 2016-10-30 FreshRSS 1.6.0
 
 * CLI
 	* New Command-Line Interface (CLI) [#1095](https://github.com/FreshRSS/FreshRSS/issues/1095)
diff --git a/constants.php b/constants.php
index 2a8486ad1..08268fdc3 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.6.0-dev');
+define('FRESHRSS_VERSION', '1.6.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3