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-notification.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-notification.ts')
| -rw-r--r-- | server/types/models/user/user-notification.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/types/models/user/user-notification.ts b/server/types/models/user/user-notification.ts index 7ebb0485d..918614dd1 100644 --- a/server/types/models/user/user-notification.ts +++ b/server/types/models/user/user-notification.ts | |||
| @@ -2,13 +2,13 @@ import { VideoAbuseModel } from '@server/models/abuse/video-abuse' | |||
| 2 | import { VideoCommentAbuseModel } from '@server/models/abuse/video-comment-abuse' | 2 | import { VideoCommentAbuseModel } from '@server/models/abuse/video-comment-abuse' |
| 3 | import { ApplicationModel } from '@server/models/application/application' | 3 | import { ApplicationModel } from '@server/models/application/application' |
| 4 | import { PluginModel } from '@server/models/server/plugin' | 4 | import { PluginModel } from '@server/models/server/plugin' |
| 5 | import { UserNotificationModel } from '@server/models/user/user-notification' | ||
| 5 | import { PickWith, PickWithOpt } from '@shared/core-utils' | 6 | import { PickWith, PickWithOpt } from '@shared/core-utils' |
| 6 | import { AbuseModel } from '../../../models/abuse/abuse' | 7 | import { AbuseModel } from '../../../models/abuse/abuse' |
| 7 | import { AccountModel } from '../../../models/account/account' | 8 | import { AccountModel } from '../../../models/account/account' |
| 8 | import { ActorImageModel } from '../../../models/account/actor-image' | 9 | import { ActorModel } from '../../../models/actor/actor' |
| 9 | import { UserNotificationModel } from '../../../models/account/user-notification' | 10 | import { ActorFollowModel } from '../../../models/actor/actor-follow' |
| 10 | import { ActorModel } from '../../../models/activitypub/actor' | 11 | import { ActorImageModel } from '../../../models/actor/actor-image' |
| 11 | import { ActorFollowModel } from '../../../models/activitypub/actor-follow' | ||
| 12 | import { ServerModel } from '../../../models/server/server' | 12 | import { ServerModel } from '../../../models/server/server' |
| 13 | import { VideoModel } from '../../../models/video/video' | 13 | import { VideoModel } from '../../../models/video/video' |
| 14 | import { VideoBlacklistModel } from '../../../models/video/video-blacklist' | 14 | import { VideoBlacklistModel } from '../../../models/video/video-blacklist' |