]> 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: 1db8642 ae64a66)
Merge branch 'release/4.2.0' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 21 Jun 2022 09:00:23 +0000 (11:00 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 21 Jun 2022 09:00:23 +0000 (11:00 +0200)
1  2 
client/package.json patch | diff1 | diff2 | blob | history

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