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/controllers/api/users/my-subscriptions.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/controllers/api/users/my-subscriptions.ts')
| -rw-r--r-- | server/controllers/api/users/my-subscriptions.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts index 56b93276f..46a73d49e 100644 --- a/server/controllers/api/users/my-subscriptions.ts +++ b/server/controllers/api/users/my-subscriptions.ts | |||
| @@ -27,7 +27,7 @@ import { | |||
| 27 | userSubscriptionsSortValidator, | 27 | userSubscriptionsSortValidator, |
| 28 | videosSortValidator | 28 | videosSortValidator |
| 29 | } from '../../../middlewares/validators' | 29 | } from '../../../middlewares/validators' |
| 30 | import { ActorFollowModel } from '../../../models/activitypub/actor-follow' | 30 | import { ActorFollowModel } from '../../../models/actor/actor-follow' |
| 31 | import { VideoModel } from '../../../models/video/video' | 31 | import { VideoModel } from '../../../models/video/video' |
| 32 | 32 | ||
| 33 | const mySubscriptionsRouter = express.Router() | 33 | const mySubscriptionsRouter = express.Router() |