diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
| commit | a24bd1ed41b43790bab6ba789580bb4e85f07d85 (patch) | |
| tree | a54b0f6c921ba83a6e909cd0ced325b2d4b8863c /server/controllers/live.ts | |
| parent | 5f26f13b3c16ac5ae0a3b0a7142d84a9528cf565 (diff) | |
| parent | c63830f15403ac4e750829f27d8bbbdc9a59282c (diff) | |
| download | PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.gz PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.zst PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.zip | |
Merge branch 'next' into develop
Diffstat (limited to 'server/controllers/live.ts')
| -rw-r--r-- | server/controllers/live.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/live.ts b/server/controllers/live.ts index f2686fb23..95d5c0135 100644 --- a/server/controllers/live.ts +++ b/server/controllers/live.ts | |||
| @@ -2,7 +2,7 @@ import * as cors from 'cors' | |||
| 2 | import * as express from 'express' | 2 | import * as express from 'express' |
| 3 | import { mapToJSON } from '@server/helpers/core-utils' | 3 | import { mapToJSON } from '@server/helpers/core-utils' |
| 4 | import { LiveSegmentShaStore } from '@server/lib/live' | 4 | import { LiveSegmentShaStore } from '@server/lib/live' |
| 5 | import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' | 5 | import { HttpStatusCode } from '@shared/models' |
| 6 | 6 | ||
| 7 | const liveRouter = express.Router() | 7 | const liveRouter = express.Router() |
| 8 | 8 | ||