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

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

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');