summaryrefslogtreecommitdiff
path: root/src/drive
diff options
context:
space:
mode:
authorAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-02 13:15:53 +0900
committerAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-02 13:15:53 +0900
commit3fb6834f7d06d52163102b69afe353f8c65ee003 (patch)
tree2d44fc013296310c1a9baed62f45f89ec1fd179d /src/drive
parentAbolish common and misc directories (diff)
downloadmisskey-3fb6834f7d06d52163102b69afe353f8c65ee003.tar.gz
misskey-3fb6834f7d06d52163102b69afe353f8c65ee003.tar.bz2
misskey-3fb6834f7d06d52163102b69afe353f8c65ee003.zip
Introduce config module
Diffstat (limited to 'src/drive')
-rw-r--r--src/drive/add-file.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drive/add-file.ts b/src/drive/add-file.ts
index f356af00d8..db13e04be0 100644
--- a/src/drive/add-file.ts
+++ b/src/drive/add-file.ts
@@ -15,7 +15,7 @@ import DriveFolder from '../models/drive-folder';
import { pack } from '../models/drive-file';
import event, { publishDriveStream } from '../event';
import getAcct from '../user/get-acct';
-import config from '../conf';
+import config from '../config';
const gm = _gm.subClass({
imageMagick: true