From 426859e3d2bfdd2f9f570a06504463bcfba301e2 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Wed, 23 Sep 2020 14:36:13 -0700
Subject: [PATCH] Version 1.11.0

---
 CHANGELOG             | 12 ++++++++++++
 CloudronManifest.json |  2 +-
 DESCRIPTION.md        |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6677fe3..0be4f16 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -168,3 +168,15 @@
 [1.10.0]
 * Add forum url and update screenshot links
 
+[1.11.0]
+* Update FreshRSS to 1.17.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.17.0)
+* New tag management page #3121
+* New page to add feeds and categories #3027
+* Add a way to disable/enable users #3056
+* Fix special characters in user queries #3037
+* Hide feed credentials when adding a new feed #3099
+* Trim whitespace for feed passwords #3158
+* Updated PHPMailer library to 6.1.6 #3024
+* Add blogger.com to the default list of forced HTTPS #3088
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 822a635..780ec6d 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "RSS feed reader",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 3d2eb75..9670180 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.16.2</upstream>.
+This app packages FreshRSS <upstream>1.17.0</upstream>.
 
 ## About