Merge branch 'develop' into pr/1217

1 files changed, 8 insertions, 2 deletions

diff --git a/config/test.yaml b/config/test.yaml
index 04c999966..682530840 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -1,5 +1,5 @@
 listen:
-  listen: '0.0.0.0'
+  hostname: '0.0.0.0'
   port: 9000
 
 webserver:
@@ -21,6 +21,9 @@ smtp:
 log:
   level: 'debug'
 
+contact_form:
+  enabled: true
+
 redundancy:
   videos:
     check_interval: '10 minutes'
@@ -51,6 +54,7 @@ signup:
 
 transcoding:
   enabled: true
+  allow_additional_extensions: false
   threads: 2
   resolutions:
     240p: true
@@ -58,6 +62,8 @@ transcoding:
     480p: true
     720p: true
     1080p: true
+  hls:
+    enabled: true
 
 import:
   videos:
@@ -67,4 +73,4 @@ import:
       enabled: true
 
 instance:
-  default_nsfw_policy: 'display'
\ No newline at end of file
+  default_nsfw_policy: 'display'