Merge branch 'release/v1.2.0' into develop

4 files changed, 9 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 440d1fbcf..13bec7535 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,13 @@
 # Changelog
 
-## v1.2.0-rc.1
+## v1.2.0
 
 ### BREAKING CHANGES
 
  * **Docker:** `PEERTUBE_TRUST_PROXY` env variable is now an array ([LecygneNoir](https://github.com/LecygneNoir))
+ * **Docker:** Check you have all the storage fields in your `/config/production.yaml` file: https://github.com/Chocobozzz/PeerTube/blob/develop/support/docker/production/config/production.yaml#L34
  * **nginx:** Add redundancy endpoint in static file. **You should add it in your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx**
+ * **nginx:** Add socket io endpoint. **You should add it in your nginx configuration: https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md#nginx**
  * Moderators can manage users now (add/delete/update/block)
  * Add `tmp` and `redundancy` directories in configuration file. **You should configure them in your production.yaml**
 
@@ -81,6 +83,9 @@
  * Add missing translations in video embed page
  * Fix some styling issues in dark mode
  * Fix transcoding issues with some videos
+ * Fix Mac OS mkv/avi upload
+ * Fix menu overflow on mobile
+ * Fix ownership button icons ([@joshmorel](https://github.com/joshmorel))
 
 
 ## v1.1.0
diff --git a/client/package.json b/client/package.json
index 42deddd5f..31fc77887 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0",
   "private": true,
   "licence": "GPLv3",
   "author": {
diff --git a/package.json b/package.json
index f91bf8593..0cf39c7ee 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.2.0-rc.1",
+  "version": "1.2.0",
   "private": true,
   "licence": "AGPLv3",
   "engines": {
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index cca555806..f2bb945f9 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.2.0-rc.1
+  version: 1.2.0
   contact:
     name: PeerTube Community
     url: 'https://joinpeertube.org'