diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-03-26 19:06:05 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-03-26 19:06:05 +0200 |
| commit | 5888c37bbebb261f024e174b32c3e4543024f068 (patch) | |
| tree | 87de4967067e4f65f55d562e68f8752e1f061903 | |
| parent | 7a6751b50d9c809d2127a154bf811f576a24e4a4 (diff) | |
| parent | f48ce976246df829df7ef90852ee02c169e17402 (diff) | |
Merge branch 'FreshRSS/dev' into compat-php7.1
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | constants.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7148bee98..9b25afdab 100644 --- 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 diff --git a/constants.php b/constants.php index c6966fb7a..87cfb030b 100644 --- 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'); |