diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
| commit | 8f608a4cb22ab232cfab20665050764b38bac9c7 (patch) | |
| tree | 6a6785aae79bf5939ad7b7a50a1bd8031268d2b4 /server/types/models/user/user-video-history.ts | |
| parent | 030ccfce59a8cb8f2fee6ea8dd363ba635c5c5c2 (diff) | |
| parent | c215e627b575d2c4085ccb222f4ca8d0237b7552 (diff) | |
| download | PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.gz PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.zst PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.zip | |
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to 'server/types/models/user/user-video-history.ts')
| -rw-r--r-- | server/types/models/user/user-video-history.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/types/models/user/user-video-history.ts b/server/types/models/user/user-video-history.ts index 62673ab1b..34e2930e7 100644 --- a/server/types/models/user/user-video-history.ts +++ b/server/types/models/user/user-video-history.ts | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | import { UserVideoHistoryModel } from '../../../models/account/user-video-history' | 1 | import { UserVideoHistoryModel } from '../../../models/user/user-video-history' |
| 2 | 2 | ||
| 3 | export type MUserVideoHistory = Omit<UserVideoHistoryModel, 'Video' | 'User'> | 3 | export type MUserVideoHistory = Omit<UserVideoHistoryModel, 'Video' | 'User'> |
| 4 | 4 | ||