diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-02-20 20:27:51 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-02-20 20:27:51 +0900 |
| commit | 47ec35f81bb3fe308d2d47728e17f8d7b148d88b (patch) | |
| tree | 9dc644853637a1a3eac13890c84923f2f13f1e7b | |
| parent | wip (diff) | |
| parent | Merge pull request #189 from syuilo/greenkeeper/serve-favicon-2.4.0 (diff) | |
| download | misskey-47ec35f81bb3fe308d2d47728e17f8d7b148d88b.tar.gz misskey-47ec35f81bb3fe308d2d47728e17f8d7b148d88b.tar.bz2 misskey-47ec35f81bb3fe308d2d47728e17f8d7b148d88b.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master' into no-tag-ls
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/web/app/boot.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/package.json b/package.json index e584835b98..ce667f4385 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "riotify": "2.0.0", "rndstr": "1.0.0", "s-age": "1.1.0", - "serve-favicon": "2.3.2", + "serve-favicon": "2.4.0", "string-replace-webpack-plugin": "0.0.5", "stylus-loader": "^2.5.0", "subdomain": "1.2.0", diff --git a/src/web/app/boot.js b/src/web/app/boot.js index c5dc6845af..ab147eb562 100644 --- a/src/web/app/boot.js +++ b/src/web/app/boot.js @@ -15,6 +15,8 @@ require('./common/tags'); * MISSKEY ENTORY POINT! */ +"use strict"; + document.domain = CONFIG.host; // Set global configration |