From 59df8adfa2f646c30b882a8efd3ee7acb7c89739 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 27 Feb 2020 08:16:15 +0100
Subject: [PATCH 1/2] Update changelog

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3149476bb..4887614a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## v2.1.1
+
+### Bug fixes
+
+ * Fix youtube-dl in docker image
+ * Fix playlist creation/update
+ * Fix fetch of instance config in client
+ * Manual approves followers only for the instance (and not accounts/channels)
+ * Fix avatar update
+ * Fix CSP for embeds
+ * Fix scroll of the menu on mobile
+ * Fix CPU usage of PostgreSQL
+ * Fix embed for iOS
+ 
+
 ## v2.1.0
 
 **Since v2.0.0**

From 195ba6cdf38f4515a514cf8432930576539b0a04 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 27 Feb 2020 08:16:56 +0100
Subject: [PATCH 2/2] Bumped to version v2.1.1

---
 client/package.json          | 2 +-
 package.json                 | 2 +-
 support/doc/api/openapi.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/package.json b/client/package.json
index b9ddf7042..024e0b1d9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "private": true,
   "license": "AGPL-3.0",
   "author": {
diff --git a/package.json b/package.json
index dee9840c7..49d9faf97 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube",
   "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "private": true,
   "licence": "AGPL-3.0",
   "engines": {
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index f1cfb81a4..85f1102b4 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: PeerTube
-  version: 2.1.0
+  version: 2.1.1
   contact:
     name: PeerTube Community
     url: 'https://joinpeertube.org'