natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into no-tag-ls

This commit is contained in:
syuilo 2017-02-20 20:27:51 +09:00
parent 2a3a5d4b50 177990a591
commit 47ec35f81b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -131,7 +131,7 @@
"riotify": "2.0.0", "riotify": "2.0.0",
"rndstr": "1.0.0", "rndstr": "1.0.0",
"s-age": "1.1.0", "s-age": "1.1.0",
"serve-favicon": "2.3.2", "serve-favicon": "2.4.0",
"string-replace-webpack-plugin": "0.0.5", "string-replace-webpack-plugin": "0.0.5",
"stylus-loader": "^2.5.0", "stylus-loader": "^2.5.0",
"subdomain": "1.2.0", "subdomain": "1.2.0",

2
src/web/app/boot.js
View File

@ -15,6 +15,8 @@ require('./common/tags');
* MISSKEY ENTORY POINT! * MISSKEY ENTORY POINT!
*/ */
"use strict";
document.domain = CONFIG.host; document.domain = CONFIG.host;
// Set global configration // Set global configration