From c82bd3b17381a05a355b94432a35e617000ac88a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 8 Dec 2022 10:51:08 +0100
Subject: cherry-pick security

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9e35751f..3b14a835e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # FreshRSS changelog
 
+## 2022-12-08 FreshRSS 1.20.2
+
+* Security fixes
+	* Fix security vulnerability in `ext.php` [#4928](https://github.com/FreshRSS/FreshRSS/pull/4928)
+	* Apache `TraceEnable Off` [#4863](https://github.com/FreshRSS/FreshRSS/pull/4863)
+
+
 ## 2022-11-14 FreshRSS 1.20.1
 
 * Features
diff --git a/constants.php b/constants.php
index 8d9f43996..38808d795 100644
--- a/constants.php
+++ b/constants.php
@@ -2,8 +2,8 @@
 //NB: Do not edit; use ./constants.local.php instead.
 
 //<Not customisable>
-define('FRESHRSS_MIN_PHP_VERSION', '7.0.0');
-define('FRESHRSS_VERSION', '1.20.1');
+define('FRESHRSS_MIN_PHP_VERSION', '7.2.0');
+define('FRESHRSS_VERSION', '1.20.2');
 define('FRESHRSS_WEBSITE', 'https://freshrss.org');
 define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/');
 
-- 
cgit v1.2.3