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/tools/peertube-upload.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/tools/peertube-upload.ts')
| -rw-r--r-- | server/tools/peertube-upload.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts index b17bc4288..ebc62c965 100644 --- a/server/tools/peertube-upload.ts +++ b/server/tools/peertube-upload.ts | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | import * as program from 'commander' | 1 | import * as program from 'commander' |
| 2 | import { access, constants } from 'fs-extra' | 2 | import { access, constants } from 'fs-extra' |
| 3 | import { isAbsolute } from 'path' | 3 | import { isAbsolute } from 'path' |
| 4 | import { getClient, login } from '../tests/utils' | 4 | import { getClient, login } from '../../shared/utils' |
| 5 | import { uploadVideo } from '../tests/utils/index' | 5 | import { uploadVideo } from '../../shared/utils/' |
| 6 | import { VideoPrivacy } from '../../shared/models/videos' | 6 | import { VideoPrivacy } from '../../shared/models/videos' |
| 7 | import { netrc, getSettings } from './cli' | 7 | import { netrc, getSettings } from './cli' |
| 8 | 8 | ||