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/client.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/client.ts')
| -rw-r--r-- | server/tests/client.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/tests/client.ts b/server/tests/client.ts index b33a653b1..06b4a9c5a 100644 --- a/server/tests/client.ts +++ b/server/tests/client.ts | |||
| @@ -15,7 +15,7 @@ import { | |||
| 15 | updateCustomConfig, | 15 | updateCustomConfig, |
| 16 | updateCustomSubConfig, | 16 | updateCustomSubConfig, |
| 17 | uploadVideo | 17 | uploadVideo |
| 18 | } from './utils' | 18 | } from '../../shared/utils' |
| 19 | 19 | ||
| 20 | const expect = chai.expect | 20 | const expect = chai.expect |
| 21 | 21 | ||