diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 16:24:31 +0200 |
| commit | 0491173a61aed66205c017e0d7e0503ea316c144 (patch) | |
| tree | ce6621597505f9518cfdf0981977d097c63f9fad /README.md | |
| parent | 8704acf49efc770d73bf07c10468ed8c74d28a83 (diff) | |
| parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
| download | PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.gz PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.zst PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.zip | |
Merge branch 'develop' into cli-wrapper
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 7 |
1 files changed, 3 insertions, 4 deletions
| @@ -24,8 +24,8 @@ directly in the web browser with <a href="https://github.com/feross/webtorrent"> | |||
| 24 | <img src="https://david-dm.org/Chocobozzz/PeerTube/dev-status.svg?path=client" alt="devDependency Status" /> | 24 | <img src="https://david-dm.org/Chocobozzz/PeerTube/dev-status.svg?path=client" alt="devDependency Status" /> |
| 25 | </a> | 25 | </a> |
| 26 | 26 | ||
| 27 | <a href="https://www.browserstack.com/automate/public-build/VXBPc0szNjUvRUNsREJQRFF6RkEvSjJBclZ4VUJBUm1hcS9RZGpUbitRST0tLWFWbjNEdVN6eEZpYTk4dGVpMkVlQWc9PQ==--644e755052bf7fe2346eb6e868be8e706718a17c%"> | 27 | <a href="https://www.browserstack.com/automate/public-build/cWJhRDFJbS9qeUhzYW04MnlIVjlQQ0x3aE5POXBaV1lycGo5VlQxK3JqZz0tLTNUWW5ySEVvS1N4UnBhYlhsdXVCeVE9PQ==--db09e291d36a582af8b2929d62a625ed660cdf1d"> |
| 28 | <img src='https://www.browserstack.com/automate/badge.svg?badge_key=VXBPc0szNjUvRUNsREJQRFF6RkEvSjJBclZ4VUJBUm1hcS9RZGpUbitRST0tLWFWbjNEdVN6eEZpYTk4dGVpMkVlQWc9PQ==--644e755052bf7fe2346eb6e868be8e706718a17c%'/> | 28 | <img src='https://www.browserstack.com/automate/badge.svg?badge_key=cWJhRDFJbS9qeUhzYW04MnlIVjlQQ0x3aE5POXBaV1lycGo5VlQxK3JqZz0tLTNUWW5ySEVvS1N4UnBhYlhsdXVCeVE9PQ==--db09e291d36a582af8b2929d62a625ed660cdf1d'/> |
| 29 | </a> | 29 | </a> |
| 30 | </p> | 30 | </p> |
| 31 | 31 | ||
| @@ -97,11 +97,10 @@ BitTorrent) inside the web browser, as of today. | |||
| 97 | ## Dependencies | 97 | ## Dependencies |
| 98 | 98 | ||
| 99 | * nginx | 99 | * nginx |
| 100 | * PostgreSQL | 100 | * **PostgreSQL >= 9.6** |
| 101 | * **Redis >= 2.8.18** | 101 | * **Redis >= 2.8.18** |
| 102 | * **NodeJS >= 8.x** | 102 | * **NodeJS >= 8.x** |
| 103 | * yarn | 103 | * yarn |
| 104 | * OpenSSL (cli) | ||
| 105 | * **FFmpeg >= 3.x** | 104 | * **FFmpeg >= 3.x** |
| 106 | 105 | ||
| 107 | ## Run in production | 106 | ## Run in production |