diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-24 10:40:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 10:40:27 +0200 |
| commit | 0b4e5fe32708afce54212810738aa4d0c3dc178d (patch) | |
| tree | 5d9b160e257a2bd116e67c9363b798f422ead44c /.github | |
| parent | 23db998f07d674c621972a769df73203b14e093a (diff) | |
| parent | 01448622992b12318a2fff508e501732b59dd6be (diff) | |
| download | PeerTube-0b4e5fe32708afce54212810738aa4d0c3dc178d.tar.gz PeerTube-0b4e5fe32708afce54212810738aa4d0c3dc178d.tar.zst PeerTube-0b4e5fe32708afce54212810738aa4d0c3dc178d.zip | |
Merge branch 'develop' into unused-imports
Diffstat (limited to '.github')
| -rw-r--r-- | .github/CONTRIBUTING.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6d095cc47..4b352922e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md | |||
| @@ -44,7 +44,9 @@ before you start working on them :). | |||
| 44 | 44 | ||
| 45 | ### Prerequisites | 45 | ### Prerequisites |
| 46 | 46 | ||
| 47 | First, make sure that you have followed | 47 | First, you should use a server or PC with at least 4GB of RAM. Less RAM may lead to crashes. |
| 48 | |||
| 49 | Make sure that you have followed | ||
| 48 | [the steps](/support/doc/dependencies.md) | 50 | [the steps](/support/doc/dependencies.md) |
| 49 | to install the dependencies. | 51 | to install the dependencies. |
| 50 | 52 | ||
| @@ -173,4 +175,4 @@ $ npm run mocha -- --exit --require ts-node/register/type-check --bail server/te | |||
| 173 | ``` | 175 | ``` |
| 174 | 176 | ||
| 175 | Instance configurations are in `config/test-{1,2,3,4,5,6}.yaml`. | 177 | Instance configurations are in `config/test-{1,2,3,4,5,6}.yaml`. |
| 176 | Note that only instance 2 has transcoding enabled. \ No newline at end of file | 178 | Note that only instance 2 has transcoding enabled. |