diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-05-27 14:04:15 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-27 14:04:15 +0200 |
| commit | eb34ec30e0b57286fc6f85160490d2e973a3b0b1 (patch) | |
| tree | 293b9bf00cf6b7a9de677ece8277afd06f04f48c | |
| parent | 96d52038788dda2f479362ce8e980f895369eec7 (diff) | |
| parent | 4e67a45cd98a36b07c5fe16b8a4e361108684187 (diff) | |
| download | PeerTube-eb34ec30e0b57286fc6f85160490d2e973a3b0b1.tar.gz PeerTube-eb34ec30e0b57286fc6f85160490d2e973a3b0b1.tar.zst PeerTube-eb34ec30e0b57286fc6f85160490d2e973a3b0b1.zip | |
Merge branch 'release/3.2.0' into develop
| -rw-r--r-- | client/package.json | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | support/doc/api/openapi.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/client/package.json b/client/package.json index 7a9d872cd..f7d24b589 100644 --- a/client/package.json +++ b/client/package.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "peertube-client", | 2 | "name": "peertube-client", |
| 3 | "version": "3.2.0-rc.1", | 3 | "version": "3.2.0", |
| 4 | "private": true, | 4 | "private": true, |
| 5 | "license": "AGPL-3.0", | 5 | "license": "AGPL-3.0", |
| 6 | "author": { | 6 | "author": { |
diff --git a/package.json b/package.json index f62cf22a8..c148cedb2 100644 --- a/package.json +++ b/package.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "peertube", | 2 | "name": "peertube", |
| 3 | "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.", | 3 | "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.", |
| 4 | "version": "3.2.0-rc.1", | 4 | "version": "3.2.0", |
| 5 | "private": true, | 5 | "private": true, |
| 6 | "licence": "AGPL-3.0", | 6 | "licence": "AGPL-3.0", |
| 7 | "engines": { | 7 | "engines": { |
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 50c03fb22..11adf078d 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | openapi: 3.0.0 | 1 | openapi: 3.0.0 |
| 2 | info: | 2 | info: |
| 3 | title: PeerTube | 3 | title: PeerTube |
| 4 | version: 3.2.0-rc.1 | 4 | version: 3.2.0 |
| 5 | contact: | 5 | contact: |
| 6 | name: PeerTube Community | 6 | name: PeerTube Community |
| 7 | url: https://joinpeertube.org | 7 | url: https://joinpeertube.org |