From f63386703daad6b36162da90cc5011aa3afa349f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 23 Jul 2016 17:37:32 +0200
Subject: Prepare next dev version

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

(limited to 'constants.php')

diff --git a/constants.php b/constants.php
index 44e68c13c..8a6ce8a66 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.4.0');
+define('FRESHRSS_VERSION', '1.5.0-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3


From d552703f67da5568a5e826bc453f572e03d081cd Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 29 Aug 2016 19:46:41 +0200
Subject: Release version 1.5.0

---
 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 93d3dcd3b..e8a06eac0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2016-08-XX FreshRSS 1.5.0-dev
+## 2016-08-29 FreshRSS 1.5.0
 
 * Compatibility
 	* Require at least MySQL 5.5.3+ [#1153](https://github.com/FreshRSS/FreshRSS/issues/1153)
diff --git a/constants.php b/constants.php
index 8a6ce8a66..80a22c8f0 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.5.0-dev');
+define('FRESHRSS_VERSION', '1.5.0');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');
 
-- 
cgit v1.2.3