Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / server / types / models / account / account.ts

diff --git a/server/types/models/account/account.ts b/server/types/models/account/account.ts
index 9513acad83c0b1c5591f1a14fbeb44ec5a8d56b7..9848412919eeb9454ff165f70db6b0716ea3c4aa 100644 (file)
--- a/server/types/models/account/account.ts
+++ b/server/types/models/account/account.ts
@@ -1,7 +1,5 @@
 import { FunctionProperties, PickWith } from '@shared/core-utils'
 import { AccountModel } from '../../../models/account/account'
-import { MChannelDefault } from '../video/video-channels'
-import { MAccountBlocklistId } from './account-blocklist'
 import {
   MActor,
   MActorAPAccount,
@@ -15,7 +13,9 @@ import {
   MActorSummary,
   MActorSummaryFormattable,
   MActorUrl
-} from './actor'
+} from '../actor'
+import { MChannelDefault } from '../video/video-channels'
+import { MAccountBlocklistId } from './account-blocklist'
 
 type Use<K extends keyof AccountModel, M> = PickWith<AccountModel, K, M>