]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Merge branch 'release/4.2.0' into develop
authorChocobozzz <me@florianbigard.com>
Fri, 3 Jun 2022 12:32:44 +0000 (14:32 +0200)
committerChocobozzz <me@florianbigard.com>
Fri, 3 Jun 2022 12:32:44 +0000 (14:32 +0200)
1  2 
CHANGELOG.md
config/default.yaml
config/production.yaml.example

diff --cc CHANGELOG.md
Simple merge
Simple merge
Simple merge