Merge branch 'release/4.0.0' into develop

3 files changed, 12 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ffb00d23..b9c18c10a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## v4.0.0-rc.1
+## v4.0.0
 
 ### IMPORTANT NOTES
 
@@ -118,6 +118,15 @@
  * Fix player placeholder width
  * Fix playlist miniature size with big description
  * Correctly escape meta tags
+ * Fix audio upload client bug if not enabled by instance
+ * Add header Vary Accept-Language [#4588](https://github.com/Chocobozzz/PeerTube/pull/4588)
+ * Fix additional extensions admin config description
+ * Fix upload of video with long filename
+ * Fix pending transcoding counter with failed job
+ * Fix client header search on ios
+ * Fix iframe attribute `allow-popups` for oembed
+ * Fix theme update when logged in
+ * Fix homepage title
 
 
 ## v3.4.1
diff --git a/client/package.json b/client/package.json
index f1ebd6dec..0f52ec88c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0",
   "private": true,
   "license": "AGPL-3.0",
   "author": {
diff --git a/package.json b/package.json
index a60e0f8aa..2d342418d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube",
   "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0",
   "private": true,
   "licence": "AGPL-3.0",
   "engines": {