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/models/server/custom-config.model.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/models/server/custom-config.model.ts')
| -rw-r--r-- | shared/models/server/custom-config.model.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index 7a3eaa33f..b42ff90c6 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts | |||
| @@ -61,6 +61,9 @@ export interface CustomConfig { | |||
| 61 | '720p': boolean | 61 | '720p': boolean |
| 62 | '1080p': boolean | 62 | '1080p': boolean |
| 63 | } | 63 | } |
| 64 | hls: { | ||
| 65 | enabled: boolean | ||
| 66 | } | ||
| 64 | } | 67 | } |
| 65 | 68 | ||
| 66 | import: { | 69 | import: { |