]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
projects / github / Chocobozzz / PeerTube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60979b0 2769e29)
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 patch | diff1 | diff2 | blob | history

diff --cc package.json
Simple merge
ActivityPub-federated video streaming platform using P2P directly in your web browser