Merge branch 'FreshRSS/dev' into compat-php7.1

8 years ago · 5888c37bbe
parent 7a6751b50d f48ce97624
commit 5888c37bbe
2 changed files with 2 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,6 @@
 # Changelog

-## 2017-xx-xx FreshRSS 1.6.4-dev
+## 2017-xx-xx FreshRSS 1.7.0-dev


 ## 2017-03-11 FreshRSS 1.6.3
--- a/constants.php
+++ b/constants.php
@ -1,5 +1,5 @@
 <?php
-define('FRESHRSS_VERSION', '1.6.4-dev');
+define('FRESHRSS_VERSION', '1.7.0-dev');
 define('FRESHRSS_WEBSITE', 'http://freshrss.org');
 define('FRESHRSS_WIKI', 'http://doc.freshrss.org');