diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-08-30 19:03:03 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-08-30 19:03:03 +0200 |
| commit | 76dbe843d1cd9cb96898bc994f64fabc0e6a48c4 (patch) | |
| tree | dc54dd51ace6784bfd5697ec4d596d0a06def399 | |
| parent | d8a80446da8b8b00938b4928ed0ef874822d2553 (diff) | |
| parent | 0c302acb3c358b4d4d8dee45aed1de1108ea37ea (diff) | |
| download | PeerTube-76dbe843d1cd9cb96898bc994f64fabc0e6a48c4.tar.gz PeerTube-76dbe843d1cd9cb96898bc994f64fabc0e6a48c4.tar.zst PeerTube-76dbe843d1cd9cb96898bc994f64fabc0e6a48c4.zip | |
Merge branch 'release/5.2.0' into develop
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | client/package.json | 2 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4046cdd52..1f95d2931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,5 +1,15 @@ | |||
| 1 | # Changelog | 1 | # Changelog |
| 2 | 2 | ||
| 3 | ## v5.2.1 | ||
| 4 | |||
| 5 | ### Bug fixes | ||
| 6 | |||
| 7 | * Fix loading spinner displayed forever on Chrome | ||
| 8 | * Fix broken replay with long live name | ||
| 9 | * Fix fps transcoding on remote runners | ||
| 10 | * Fix terms/code of conduct link toggle | ||
| 11 | |||
| 12 | |||
| 3 | ## v5.2.0 | 13 | ## v5.2.0 |
| 4 | 14 | ||
| 5 | ### IMPORTANT NOTES | 15 | ### IMPORTANT NOTES |
diff --git a/client/package.json b/client/package.json index 9c311622b..5a0481be6 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": "5.2.0", | 3 | "version": "5.2.1", |
| 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 76d84d0ea..e278e65de 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": "5.2.0", | 4 | "version": "5.2.1", |
| 5 | "private": true, | 5 | "private": true, |
| 6 | "licence": "AGPL-3.0", | 6 | "licence": "AGPL-3.0", |
| 7 | "engines": { | 7 | "engines": { |