diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
| commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
| tree | 03204a408d56311692c3528bedcf95d2455e94f2 /config/test-2.yaml | |
| parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
| parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
| download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip | |
Merge branch 'master' into webseed-merged
Diffstat (limited to 'config/test-2.yaml')
| -rw-r--r-- | config/test-2.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/test-2.yaml b/config/test-2.yaml index ec2cff811..1b937898f 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml | |||
| @@ -15,7 +15,3 @@ storage: | |||
| 15 | logs: 'test2/logs/' | 15 | logs: 'test2/logs/' |
| 16 | thumbnails: 'test2/thumbnails/' | 16 | thumbnails: 'test2/thumbnails/' |
| 17 | torrents: 'test2/torrents/' | 17 | torrents: 'test2/torrents/' |
| 18 | |||
| 19 | network: | ||
| 20 | friends: | ||
| 21 | - 'http://localhost:9003' | ||