diff options
| author | buoyantair <buoyantair@protonmail.com> | 2018-11-16 02:37:16 +0530 |
|---|---|---|
| committer | buoyantair <buoyantair@protonmail.com> | 2018-11-16 02:37:16 +0530 |
| commit | ae28cdf327d782e629379eee1999096ca2a5d74b (patch) | |
| tree | bfe0d4b3a232d75161fe5bba9196553a388fc02a /server/tests/api/index-4.ts | |
| parent | d4681c0074ba51c62a3aeb9fb3f2cd071dd21e32 (diff) | |
| parent | 8cf998733496d44fa564e2e252356b871756c984 (diff) | |
| download | PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.tar.gz PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.tar.zst PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.zip | |
Merge from upstream
Diffstat (limited to 'server/tests/api/index-4.ts')
| -rw-r--r-- | server/tests/api/index-4.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server/tests/api/index-4.ts b/server/tests/api/index-4.ts index 8e69b95a6..7d8be2b3d 100644 --- a/server/tests/api/index-4.ts +++ b/server/tests/api/index-4.ts | |||
| @@ -1 +1,2 @@ | |||
| 1 | import './redundancy' | 1 | import './redundancy' |
| 2 | import './activitypub' | ||