diff options
author | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
---|---|---|
committer | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
commit | bc22d60899e14631cba0fb6450f4e85fc9528293 (patch) | |
tree | 285fa55033bc065df803adc2e4e3142fdfdd7309 /shared/utils/videos/video-captions.ts | |
parent | b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13 (diff) | |
parent | d216b5387fb774d1355df3ace002f7be469bd450 (diff) | |
download | PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.gz PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.zst PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.zip |
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
Diffstat (limited to 'shared/utils/videos/video-captions.ts')
-rw-r--r-- | shared/utils/videos/video-captions.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/utils/videos/video-captions.ts b/shared/utils/videos/video-captions.ts index 41e52be07..8d67f617b 100644 --- a/shared/utils/videos/video-captions.ts +++ b/shared/utils/videos/video-captions.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { makeDeleteRequest, makeGetRequest } from '../' | 1 | import { makeDeleteRequest, makeGetRequest, makeUploadRequest } from '../requests/requests' |
2 | import { buildAbsoluteFixturePath, makeUploadRequest } from '../index' | ||
3 | import * as request from 'supertest' | 2 | import * as request from 'supertest' |
4 | import * as chai from 'chai' | 3 | import * as chai from 'chai' |
4 | import { buildAbsoluteFixturePath } from '../miscs/miscs' | ||
5 | 5 | ||
6 | const expect = chai.expect | 6 | const expect = chai.expect |
7 | 7 | ||