]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Merge branch 'release/beta-10' into develop
authorChocobozzz <me@florianbigard.com>
Mon, 6 Aug 2018 10:11:08 +0000 (12:11 +0200)
committerChocobozzz <me@florianbigard.com>
Mon, 6 Aug 2018 10:11:08 +0000 (12:11 +0200)
1  2 
package.json

diff --cc package.json
Simple merge