From 4872442c62f63ef97a0e12c43b4700b98ebcdc15 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 26 Jan 2019 16:23:48 +0100
Subject: Start 1.13.2-dev

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'constants.php')

diff --git a/constants.php b/constants.php
index 8a49d7c01..2072e5ea1 100644
--- a/constants.php
+++ b/constants.php
@@ -2,7 +2,7 @@
 //NB: Do not edit; use ./constants.local.php instead.
 
 //<Not customisable>
-define('FRESHRSS_VERSION', '1.13.1');
+define('FRESHRSS_VERSION', '1.13.2-dev');
 define('FRESHRSS_WEBSITE', 'https://freshrss.org');
 define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/');
 
-- 
cgit v1.2.3


From 999d1b8c035f4de31026198dad93f485392df8d4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 4 Mar 2019 21:21:38 +0100
Subject: Use getenv instead of $_SERVER for environment variables

getenv() is the proper way, and $_SERVER was not working on some
configurations.
Improvement of https://github.com/FreshRSS/FreshRSS/pull/2213
---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'constants.php')

diff --git a/constants.php b/constants.php
index 2072e5ea1..dacbb11aa 100644
--- a/constants.php
+++ b/constants.php
@@ -33,7 +33,7 @@ safe_define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS
 safe_define('PHP_COMPRESSION', false);
 
 // For cases when syslog is not available
-safe_define('COPY_SYSLOG_TO_STDERR', isset($_SERVER['COPY_SYSLOG_TO_STDERR']) ? filter_var($_SERVER['COPY_SYSLOG_TO_STDERR'], FILTER_VALIDATE_BOOLEAN) : false);
+safe_define('COPY_SYSLOG_TO_STDERR', filter_var(getenv('COPY_SYSLOG_TO_STDERR'), FILTER_VALIDATE_BOOLEAN));
 
 // Maximum log file size in Bytes, before it will be divided by two
 safe_define('MAX_LOG_SIZE', 1048576);
-- 
cgit v1.2.3


From b2bc1f95d9f673f79cd7076758856bb19876154f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 Mar 2019 00:01:50 +0100
Subject: Bump to 1.14.0-dev

---
 constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'constants.php')

diff --git a/constants.php b/constants.php
index dacbb11aa..73b092849 100644
--- a/constants.php
+++ b/constants.php
@@ -2,7 +2,7 @@
 //NB: Do not edit; use ./constants.local.php instead.
 
 //<Not customisable>
-define('FRESHRSS_VERSION', '1.13.2-dev');
+define('FRESHRSS_VERSION', '1.14.0-dev');
 define('FRESHRSS_WEBSITE', 'https://freshrss.org');
 define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/');
 
-- 
cgit v1.2.3


From 13c13ab46bcd16ae57f95e7fd2ecaa2765667b56 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 Mar 2019 13:16:00 +0200
Subject: Release 1.14.0

---
 CHANGELOG.md  | 2 +-
 constants.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'constants.php')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fae9f30c1..f43d470a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # FreshRSS changelog
 
-## 2019-03-XX FreshRSS 1.14.0-dev
+## 2019-03-31 FreshRSS 1.14.0
 
 * Features
 	* *Filter actions* feature, to auto-mark-as-read based on a search query per feed [#2275](https://github.com/FreshRSS/FreshRSS/pull/2275)
diff --git a/constants.php b/constants.php
index 73b092849..1432ced48 100644
--- a/constants.php
+++ b/constants.php
@@ -2,7 +2,7 @@
 //NB: Do not edit; use ./constants.local.php instead.
 
 //<Not customisable>
-define('FRESHRSS_VERSION', '1.14.0-dev');
+define('FRESHRSS_VERSION', '1.14.0');
 define('FRESHRSS_WEBSITE', 'https://freshrss.org');
 define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/');
 
-- 
cgit v1.2.3