Merge branch 'release/1.4.0' into develop

4 files changed, 13 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb0c74bb7..215ef59a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## v1.4.1
+
+### Bug fixes
+
+ * Fix too fast redundancy eviction
+ * Fix broken auto blacklist page
+ * Rename signup steps
+ * Fix menu x overflow
+
+
 ## v1.4.0
 
 **Since v1.3.1**
diff --git a/client/package.json b/client/package.json
index ddb3eb06a..39fd63434 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "licence": "GPLv3",
   "author": {
diff --git a/package.json b/package.json
index 38c40bcf0..ca1f94572 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": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "licence": "AGPLv3",
   "engines": {
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 69717525d..b0473c7e7 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: 1.4.0
+  version: 1.4.1
   contact:
     name: PeerTube Community
     url: 'https://joinpeertube.org'