diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-06-03 14:32:44 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-06-03 14:32:44 +0200 |
| commit | e771ff815dba3b4a95633f4e1e10dacd222dfe61 (patch) | |
| tree | 9e1909e1fff3c602ac894b43dbf72316aca62b70 /CHANGELOG.md | |
| parent | 8a2166c9bfa452ce707740d99c64d668cd7cedce (diff) | |
| parent | 62f53731cf807562ba885b180e71bb75b3902443 (diff) | |
| download | PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.tar.gz PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.tar.zst PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.zip | |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ca27aa3a5..4638cd6d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | * Add `client.videos.resumable_upload.max_chunk_size` config option [#4857](https://github.com/Chocobozzz/PeerTube/pull/4857) | 17 | * Add `client.videos.resumable_upload.max_chunk_size` config option [#4857](https://github.com/Chocobozzz/PeerTube/pull/4857) |
| 18 | * Add `object_storage.upload_acl` config option [#4861](https://github.com/Chocobozzz/PeerTube/pull/4861) | 18 | * Add `object_storage.upload_acl` config option [#4861](https://github.com/Chocobozzz/PeerTube/pull/4861) |
| 19 | * Add ability to set RTMP/RTMPS listening hostname using `rtmp.hostname`/`rtmps.hostname` and public RTMP/RTMPS hostname using `rtmp.public_hostname`/`rtmps.public_hostname` | 19 | * Add ability to set RTMP/RTMPS listening hostname using `rtmp.hostname`/`rtmps.hostname` and public RTMP/RTMPS hostname using `rtmp.public_hostname`/`rtmps.public_hostname` |
| 20 | * Removed `best` default trending algorithm. It is automatically used if using `hot` algorithm with a logged in user | ||
| 20 | 21 | ||
| 21 | ### Docker | 22 | ### Docker |
| 22 | 23 | ||