aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-30 20:13:37 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-30 20:13:37 +0100
commit29e1f048159b7a580bdf1bab184e928f11d104b4 (patch)
tree39b0ae9ac0b0d1ed7fa11c747a0523cb3faa384b
parent86f86d3825ffff5fc1d466d4524b90ee983511ee (diff)
Prepare master 1.6.0 release
https://github.com/FreshRSS/FreshRSS/issues/1328
-rw-r--r--CHANGELOG.md2
-rw-r--r--constants.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e89daf76..461949128 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog
-## 2016-10-XX FreshRSS 1.6.0-dev
+## 2016-10-30 FreshRSS 1.6.0
* CLI
* New Command-Line Interface (CLI) [#1095](https://github.com/FreshRSS/FreshRSS/issues/1095)
diff --git a/constants.php b/constants.php
index 2a8486ad1..08268fdc3 100644
--- a/constants.php
+++ b/constants.php
@@ -1,5 +1,5 @@
<?php
-define('FRESHRSS_VERSION', '1.6.0-dev');
+define('FRESHRSS_VERSION', '1.6.0');
define('FRESHRSS_WEBSITE', 'http://freshrss.org');
define('FRESHRSS_WIKI', 'http://doc.freshrss.org');