summaryrefslogtreecommitdiff
path: root/src/server/api/common
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/common
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/common')
-rw-r--r--src/server/api/common/signin.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/api/common/signin.ts b/src/server/api/common/signin.ts
index a11ea56c0c..f9688790c4 100644
--- a/src/server/api/common/signin.ts
+++ b/src/server/api/common/signin.ts
@@ -1,4 +1,4 @@
-import config from '../../../conf';
+import config from '../../../config';
export default function(res, user, redirect: boolean) {
const expires = 1000 * 60 * 60 * 24 * 365; // One Year