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-5.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-5.yaml')
-rw-r--r-- | config/test-5.yaml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/test-5.yaml b/config/test-5.yaml index 08ed9f068..3a54599f5 100644 --- a/config/test-5.yaml +++ b/config/test-5.yaml | |||
@@ -15,8 +15,3 @@ storage: | |||
15 | logs: 'test5/logs/' | 15 | logs: 'test5/logs/' |
16 | thumbnails: 'test5/thumbnails/' | 16 | thumbnails: 'test5/thumbnails/' |
17 | torrents: 'test5/torrents/' | 17 | torrents: 'test5/torrents/' |
18 | |||
19 | network: | ||
20 | friends: | ||
21 | - 'http://localhost:9001' | ||
22 | - 'http://localhost:9004' | ||