Merge branch 'release/3.0.0' into develop

4 files changed, 26 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a1ad2c0b..05d80b7c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## v3.0.1
+
+### SECURITY
+
+ * **Important** Fix retrieving data of another user if the username contains `_` when fetching *my information*
+
+### Docker
+
+ * Fix [upgrade documentation](https://docs.joinpeertube.org/install-docker?id=upgrade)
+ * Add live RTMP port in docker compose
+
+### Bug fixes
+
+ * Fix account feed URL
+ * Log RTMP server error (address already in use)
+ * Fix NPM theme links in admin theme page
+ * Don't reject AP actors with empty description
+ * Fix twitter admin config description
+ * Fix duplicate entry in job list page
+ * Fix `nl-NL` broken admin config page
+ * Fix bad tracker client IP when using a reverse proxy
+
+
 ## v3.0.0
 
 **Since v2.4.0**
diff --git a/client/package.json b/client/package.json
index be54a3ae9..7ee661193 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": true,
   "license": "AGPL-3.0",
   "author": {
diff --git a/package.json b/package.json
index 382e79ff5..90b3768ac 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": "3.0.0",
+  "version": "3.0.1",
   "private": true,
   "licence": "AGPL-3.0",
   "engines": {
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 8f60dbceb..74b2dee28 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: 3.0.0
+  version: 3.0.1
   contact:
     name: PeerTube Community
     url: 'https://joinpeertube.org'