diff options
| author |  Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
| 2016-12-21 17:09:04 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
| 2016-12-21 17:09:04 +0100 |
| commit | 969c61871ed65ee3fd9007db03a51ef94f24df72 (patch) | |
| tree | 50526d7d2770c894515d8437b5774478663e52ac | |
| parent | 5fd1fc225c9ae37305d8bcffe60a4138afa22f6a (diff) | |
| parent | 25aa4fba7e45a57c08886996e7cc6619c70e148d (diff) | |
Merge branch 'prepare-1.6.2' into favicon-user-agent
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | constants.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6acb964e2..e812d70be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2016-xx-xx FreshRSS 1.7.0-dev +## 2016-12-xx FreshRSS 1.6.2-dev * Features * Add git compatibility in Web update system [#1357](https://github.com/FreshRSS/FreshRSS/issues/1357) @@ -12,8 +12,10 @@ * PostgreSQL: fix bug when updating cached values [#1360](https://github.com/FreshRSS/FreshRSS/issues/1360) * Fix bug in confirmation before marking as read [#1348](https://github.com/FreshRSS/FreshRSS/issues/1348) * Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363) + * Allow slash in database hostname, when using sockets [#1364](https://github.com/FreshRSS/FreshRSS/issues/1364) * Misc. * More robust export function in the case of large datasets [#1372](https://github.com/FreshRSS/FreshRSS/issues/1372) + * Add a check for PHP extension fileinfo [#1375](https://github.com/FreshRSS/FreshRSS/issues/1375) ## 2016-11-02 FreshRSS 1.6.1 diff --git a/constants.php b/constants.php index 87cfb030b..2d934ec7c 100644 --- a/constants.php +++ b/constants.php @@ -1,5 +1,5 @@ <?php -define('FRESHRSS_VERSION', '1.7.0-dev'); +define('FRESHRSS_VERSION', '1.6.2-dev'); define('FRESHRSS_WEBSITE', 'http://freshrss.org'); define('FRESHRSS_WIKI', 'http://doc.freshrss.org'); |