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.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.ts')
| -rw-r--r-- | server.ts | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -125,7 +125,7 @@ import { PeerTubeVersionCheckScheduler } from './server/lib/schedulers/peertube- | |||
| 125 | import { Hooks } from './server/lib/plugins/hooks' | 125 | import { Hooks } from './server/lib/plugins/hooks' |
| 126 | import { PluginManager } from './server/lib/plugins/plugin-manager' | 126 | import { PluginManager } from './server/lib/plugins/plugin-manager' |
| 127 | import { LiveManager } from './server/lib/live' | 127 | import { LiveManager } from './server/lib/live' |
| 128 | import { HttpStatusCode } from './shared/core-utils/miscs/http-error-codes' | 128 | import { HttpStatusCode } from './shared/models/http/http-error-codes' |
| 129 | import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache' | 129 | import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache' |
| 130 | import { ServerConfigManager } from '@server/lib/server-config-manager' | 130 | import { ServerConfigManager } from '@server/lib/server-config-manager' |
| 131 | 131 | ||