]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Merge branch 'release/3.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 25 Mar 2021 15:25:28 +0000 (16:25 +0100)
committerChocobozzz <me@florianbigard.com>
Thu, 25 Mar 2021 15:25:28 +0000 (16:25 +0100)
1  2 
package.json

diff --cc package.json
Simple merge