diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-04-02 13:18:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-02 13:18:01 +0900 |
| commit | 52262c7abc643b402a379738df4170f1f3dc94b5 (patch) | |
| tree | 2d44fc013296310c1a9baed62f45f89ec1fd179d /src/server/api/streaming.ts | |
| parent | Merge pull request #1361 from akihikodaki/misc (diff) | |
| parent | Introduce config module (diff) | |
| download | misskey-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/streaming.ts')
| -rw-r--r-- | src/server/api/streaming.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/api/streaming.ts b/src/server/api/streaming.ts index c86c6a8b4a..edcf505d24 100644 --- a/src/server/api/streaming.ts +++ b/src/server/api/streaming.ts @@ -1,7 +1,7 @@ import * as http from 'http'; import * as websocket from 'websocket'; import * as redis from 'redis'; -import config from '../../conf'; +import config from '../../config'; import { default as User, IUser } from '../../models/user'; import AccessToken from '../../models/access-token'; import isNativeToken from './common/is-native-token'; |