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/client | |
| 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/client')
| -rw-r--r-- | src/client/docs/api/gulpfile.ts | 2 | ||||
| -rw-r--r-- | src/client/docs/vars.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/docs/api/gulpfile.ts b/src/client/docs/api/gulpfile.ts index 4b962fe0c6..c986e0353a 100644 --- a/src/client/docs/api/gulpfile.ts +++ b/src/client/docs/api/gulpfile.ts @@ -13,7 +13,7 @@ import * as mkdirp from 'mkdirp'; import locales from '../../../../locales'; import I18nReplacer from '../../../build/i18n'; import fa from '../../../build/fa'; -import config from './../../../conf'; +import config from './../../../config'; import generateVars from '../vars'; diff --git a/src/client/docs/vars.ts b/src/client/docs/vars.ts index 1a3b48bd76..dbdc880611 100644 --- a/src/client/docs/vars.ts +++ b/src/client/docs/vars.ts @@ -6,7 +6,7 @@ import * as licenseChecker from 'license-checker'; import * as tmp from 'tmp'; import { fa } from '../../build/fa'; -import config from '../../conf'; +import config from '../../config'; import { licenseHtml } from '../../build/license'; const constants = require('../../const.json'); |