]> 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: fcc5f77 91cc839)
Merge branch 'postgresql'
authorChocobozzz <florian.bigard@gmail.com>
Thu, 12 Jan 2017 14:20:03 +0000 (15:20 +0100)
committerChocobozzz <florian.bigard@gmail.com>
Thu, 12 Jan 2017 14:20:03 +0000 (15:20 +0100)
1  2 
README.md patch | diff1 | diff2 | blob | history

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