diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
| commit | b718fd22374d64534bcfe69932cf562894abed6a (patch) | |
| tree | 311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /config/test.yaml | |
| parent | adb115f5522bea4d52456a9fc5eb4140bb064476 (diff) | |
| parent | 501e961199578129629cf0567033d13efced9904 (diff) | |
| download | PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip | |
Merge branch 'develop' into pr/1285
Diffstat (limited to 'config/test.yaml')
| -rw-r--r-- | config/test.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.yaml b/config/test.yaml index aba5dd73c..682530840 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
| @@ -62,6 +62,8 @@ transcoding: | |||
| 62 | 480p: true | 62 | 480p: true |
| 63 | 720p: true | 63 | 720p: true |
| 64 | 1080p: true | 64 | 1080p: true |
| 65 | hls: | ||
| 66 | enabled: true | ||
| 65 | 67 | ||
| 66 | import: | 68 | import: |
| 67 | videos: | 69 | videos: |