Merge branch 'master' into testing
This commit is contained in:
commit
934475e592
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
Shipped Version: **1.0.0-rc.2**
|
Shipped Version: **1.0.0-rc.2**
|
||||||
|
|
||||||
|
|
||||||
## What is Peertube ?
|
## What is Peertube ?
|
||||||
PeerTube is a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser, using <a href="https://github.com/feross/webtorrent">WebTorrent</a>.
|
PeerTube is a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser, using <a href="https://github.com/feross/webtorrent">WebTorrent</a>.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue