summaryrefslogtreecommitdiff
path: root/src/server/api/service/github.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-04-02 13:18:01 +0900
committerGitHub <noreply@github.com>2018-04-02 13:18:01 +0900
commit52262c7abc643b402a379738df4170f1f3dc94b5 (patch)
tree2d44fc013296310c1a9baed62f45f89ec1fd179d /src/server/api/service/github.ts
parentMerge pull request #1361 from akihikodaki/misc (diff)
parentIntroduce config module (diff)
downloadmisskey-52262c7abc643b402a379738df4170f1f3dc94b5.tar.gz
misskey-52262c7abc643b402a379738df4170f1f3dc94b5.tar.bz2
misskey-52262c7abc643b402a379738df4170f1f3dc94b5.zip
Merge pull request #1362 from akihikodaki/misc
Introduce config module
Diffstat (limited to 'src/server/api/service/github.ts')
-rw-r--r--src/server/api/service/github.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index b4068c729e..4fd59c2a94 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -2,7 +2,7 @@ import * as EventEmitter from 'events';
import * as express from 'express';
//const crypto = require('crypto');
import User from '../../../models/user';
-import config from '../../../conf';
+import config from '../../../config';
import queue from '../../../queue';
module.exports = async (app: express.Application) => {