diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
| commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
| tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /server/tests/api/users/index.ts | |
| parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
| parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
| download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip | |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'server/tests/api/users/index.ts')
| -rw-r--r-- | server/tests/api/users/index.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/tests/api/users/index.ts b/server/tests/api/users/index.ts index ff433315d..52ba6984e 100644 --- a/server/tests/api/users/index.ts +++ b/server/tests/api/users/index.ts | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | import './users-verification' | ||
| 2 | import './user-notifications' | ||
| 1 | import './blocklist' | 3 | import './blocklist' |
| 2 | import './user-subscriptions' | 4 | import './user-subscriptions' |
| 3 | import './users' | 5 | import './users' |
| 4 | import './users-multiple-servers' | 6 | import './users-multiple-servers' |
| 5 | import './users-verification' | ||