Merge branch 'master' into webseed-merged

[github/Chocobozzz/PeerTube.git] / config / default.yaml

diff --git a/config/default.yaml b/config/default.yaml
index 87b72aa3b40ad015d593482b84aa45a0773f25e0..b44be31b0ab2ad92fd0295a161e976e5032901fc 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -17,6 +17,7 @@ storage:
   uploads: 'uploads/'
   logs: 'logs/'
   thumbnails: 'thumbnails/'
+  torrents: 'torrents/'
 
-network:
-  friends: []
+electron:
+  debug: false