From be44dac754c20956e49f3961687bdf89fac4e055 Mon Sep 17 00:00:00 2001 From: v0dy Date: Mon, 6 Jun 2016 02:21:29 +0200 Subject: [PATCH 1/2] Add url to cinematrix.one Added entry to cinematrix.one --- docs/faq.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 4f4f7121..b5879145 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -76,6 +76,7 @@ WebTorrent is still pretty new, but it's already being used in cool ways: - **[Instant-Share][instant-share]** - File sharing over WebTorrent - **[P2PDrop][p2pdrop]** - Securely share files between peers ([source code][p2pdrop-source]) - **[Twister][twister]** - Decentralized microblogging service, using WebTorrent for media attachments ([source code][twister-source]) +- **[Cinematrix][cinematrix]** - Popcorn time in the browser with free content - ***Your app here – [Send a pull request][pr] with your URL!*** [webtorrent-desktop]: https://webtorrent.io/desktop @@ -109,6 +110,7 @@ WebTorrent is still pretty new, but it's already being used in cool ways: [p2pdrop-source]: https://github.com/ajainvivek/P2PDrop [twister]: http://twister.net.co/?p=589 [twister-source]: https://github.com/miguelfreitas/twister-html +[cinematrix]: http://cinematrix.one/ ## How does WebTorrent work? From 3e182af965509c4fd9a6808a376cfd17e92508a2 Mon Sep 17 00:00:00 2001 From: v0dy Date: Mon, 6 Jun 2016 02:40:38 +0200 Subject: [PATCH 2/2] Update faq.md --- docs/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.md b/docs/faq.md index b5879145..b17600a7 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -76,7 +76,7 @@ WebTorrent is still pretty new, but it's already being used in cool ways: - **[Instant-Share][instant-share]** - File sharing over WebTorrent - **[P2PDrop][p2pdrop]** - Securely share files between peers ([source code][p2pdrop-source]) - **[Twister][twister]** - Decentralized microblogging service, using WebTorrent for media attachments ([source code][twister-source]) -- **[Cinematrix][cinematrix]** - Popcorn time in the browser with free content +- **[Cinematrix][cinematrix]** - Stream your favorite free content - ***Your app here – [Send a pull request][pr] with your URL!*** [webtorrent-desktop]: https://webtorrent.io/desktop