]> 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: 185a4ab 2c0070c)
Merge branch 'develop' into release/v1.2.0
authorChocobozzz <me@florianbigard.com>
Tue, 29 Jan 2019 07:42:12 +0000 (08:42 +0100)
committerChocobozzz <me@florianbigard.com>
Tue, 29 Jan 2019 07:42:12 +0000 (08:42 +0100)

Trivial merge
ActivityPub-federated video streaming platform using P2P directly in your web browser