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/default.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/default.yaml')
| -rw-r--r-- | config/default.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/default.yaml b/config/default.yaml index 9a8a57879..b44be31b0 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -19,8 +19,5 @@ storage: | |||
| 19 | thumbnails: 'thumbnails/' | 19 | thumbnails: 'thumbnails/' |
| 20 | torrents: 'torrents/' | 20 | torrents: 'torrents/' |
| 21 | 21 | ||
| 22 | network: | ||
| 23 | friends: [] | ||
| 24 | |||
| 25 | electron: | 22 | electron: |
| 26 | debug: false | 23 | debug: false |