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/typings | |
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/typings')
-rw-r--r-- | server/typings/express/index.d.ts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/typings/express/index.d.ts b/server/typings/express/index.d.ts index 1a8dc3430..5469f3b83 100644 --- a/server/typings/express/index.d.ts +++ b/server/typings/express/index.d.ts | |||
@@ -22,8 +22,7 @@ import { MPlugin, MServer, MServerBlocklist } from '@server/types/models/server' | |||
22 | import { MVideoImportDefault } from '@server/types/models/video/video-import' | 22 | import { MVideoImportDefault } from '@server/types/models/video/video-import' |
23 | import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element' | 23 | import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element' |
24 | import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate' | 24 | import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate' |
25 | import { HttpMethod } from '@shared/core-utils/miscs/http-methods' | 25 | import { HttpMethod, PeerTubeProblemDocumentData, ServerErrorCode, VideoCreate } from '@shared/models' |
26 | import { PeerTubeProblemDocumentData, ServerErrorCode, VideoCreate } from '@shared/models' | ||
27 | import { File as UploadXFile, Metadata } from '@uploadx/core' | 26 | import { File as UploadXFile, Metadata } from '@uploadx/core' |
28 | import { RegisteredPlugin } from '../../lib/plugins/plugin-manager' | 27 | import { RegisteredPlugin } from '../../lib/plugins/plugin-manager' |
29 | import { | 28 | import { |