Merge branch 'release/1.4.0' into develop

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb0c74bb769dc6528d6ac83649b5673ebfe2bad6..215ef59a22961c42bee5ab10b020dcc54f5a1974 100644 (file)
--- 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 ddb3eb06a9368810ba542d5b1c6c6470f2892d7e..39fd634340a80528651de54ae7e2d6ed4d80adc4 100644 (file)
--- 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 38c40bcf0788f48aca8122f8e89162b84d2f3217..ca1f94572e1d11458fc14bc9aaf1315fc3cbccc5 100644 (file)
--- 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 69717525dae297d8f2b1b98ca46ebad6cdde1d57..b0473c7e708964ba488aae8fb9e49dd277e73e4d 100644 (file)
--- 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'