diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /server/tests/api/users/index.ts | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'server/tests/api/users/index.ts')
| -rw-r--r-- | server/tests/api/users/index.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/tests/api/users/index.ts b/server/tests/api/users/index.ts index 21d75da3e..52ba6984e 100644 --- a/server/tests/api/users/index.ts +++ b/server/tests/api/users/index.ts | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | import './users-verification' | ||
| 2 | import './user-notifications' | ||
| 3 | import './blocklist' | ||
| 1 | import './user-subscriptions' | 4 | import './user-subscriptions' |
| 2 | import './users' | 5 | import './users' |
| 3 | import './users-verification' | ||
| 4 | import './users-multiple-servers' | 6 | import './users-multiple-servers' |