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 /shared/utils/server/config.ts | |
| 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 'shared/utils/server/config.ts')
| -rw-r--r-- | shared/utils/server/config.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/shared/utils/server/config.ts b/shared/utils/server/config.ts index 0c5512bab..29c24cff9 100644 --- a/shared/utils/server/config.ts +++ b/shared/utils/server/config.ts | |||
| @@ -97,6 +97,9 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) { | |||
| 97 | '480p': true, | 97 | '480p': true, |
| 98 | '720p': false, | 98 | '720p': false, |
| 99 | '1080p': false | 99 | '1080p': false |
| 100 | }, | ||
| 101 | hls: { | ||
| 102 | enabled: false | ||
| 100 | } | 103 | } |
| 101 | }, | 104 | }, |
| 102 | import: { | 105 | import: { |