aboutsummaryrefslogtreecommitdiffhomepage
path: root/config/test.yaml
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-02-06 12:26:58 +0100
committerChocobozzz <me@florianbigard.com>2019-02-06 12:26:58 +0100
commit73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch)
tree43dbb7748e281f8d80f15326f489cdea10ec857d /config/test.yaml
parentc22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff)
parentf5305c04aae14467d6f957b713c5a902275cbb89 (diff)
downloadPeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz
PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst
PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip
Merge branch 'release/v1.2.0'
Diffstat (limited to 'config/test.yaml')
-rw-r--r--config/test.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/test.yaml b/config/test.yaml
index 9c051fabc..aba5dd73c 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -21,6 +21,9 @@ smtp:
21log: 21log:
22 level: 'debug' 22 level: 'debug'
23 23
24contact_form:
25 enabled: true
26
24redundancy: 27redundancy:
25 videos: 28 videos:
26 check_interval: '10 minutes' 29 check_interval: '10 minutes'
@@ -51,6 +54,7 @@ signup:
51 54
52transcoding: 55transcoding:
53 enabled: true 56 enabled: true
57 allow_additional_extensions: false
54 threads: 2 58 threads: 2
55 resolutions: 59 resolutions:
56 240p: true 60 240p: true
@@ -67,4 +71,4 @@ import:
67 enabled: true 71 enabled: true
68 72
69instance: 73instance:
70 default_nsfw_policy: 'display' \ No newline at end of file 74 default_nsfw_policy: 'display'