diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-03-11 11:11:00 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-03-11 11:11:00 +0100 |
| commit | 4495806f2f5045a0626ab64f43b5fc4deefe2ac0 (patch) | |
| tree | e83b61b8da313fe1add571b9dd73261828c38cf9 /server/controllers/api/config.ts | |
| parent | 052bdb7c120b2ac7a1616a8072f9eedd2ab2f4b6 (diff) | |
| parent | 58ae266bada2233945c4446220c22ccc4e7c62b5 (diff) | |
| download | PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.tar.gz PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.tar.zst PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.zip | |
Merge remote-tracking branch 'weblate/develop' into develop
Diffstat (limited to 'server/controllers/api/config.ts')
| -rw-r--r-- | server/controllers/api/config.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 821ed4ad3..376143cb8 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts | |||
| @@ -237,6 +237,9 @@ function customConfig (): CustomConfig { | |||
| 237 | live: { | 237 | live: { |
| 238 | enabled: CONFIG.LIVE.ENABLED, | 238 | enabled: CONFIG.LIVE.ENABLED, |
| 239 | allowReplay: CONFIG.LIVE.ALLOW_REPLAY, | 239 | allowReplay: CONFIG.LIVE.ALLOW_REPLAY, |
| 240 | latencySetting: { | ||
| 241 | enabled: CONFIG.LIVE.LATENCY_SETTING.ENABLED | ||
| 242 | }, | ||
| 240 | maxDuration: CONFIG.LIVE.MAX_DURATION, | 243 | maxDuration: CONFIG.LIVE.MAX_DURATION, |
| 241 | maxInstanceLives: CONFIG.LIVE.MAX_INSTANCE_LIVES, | 244 | maxInstanceLives: CONFIG.LIVE.MAX_INSTANCE_LIVES, |
| 242 | maxUserLives: CONFIG.LIVE.MAX_USER_LIVES, | 245 | maxUserLives: CONFIG.LIVE.MAX_USER_LIVES, |