summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-05-18 14:56:27 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-05-18 14:56:27 +0900
commit6335574688b29f83aea491c92b8ea41685e4c8a5 (patch)
treed41ca2150c5287273e6489970ca5df18cf759e1f
parentDOC: :v: (diff)
parentMerge pull request #468 from syuilo/greenkeeper/debug-2.6.7 (diff)
downloadsharkey-6335574688b29f83aea491c92b8ea41685e4c8a5.tar.gz
sharkey-6335574688b29f83aea491c92b8ea41685e4c8a5.tar.bz2
sharkey-6335574688b29f83aea491c92b8ea41685e4c8a5.zip
Merge branch 'master' of https://github.com/syuilo/misskey
-rw-r--r--package.json4
-rw-r--r--src/web/app/boot.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json
index f5927cb561..8d77b0de1e 100644
--- a/package.json
+++ b/package.json
@@ -95,14 +95,14 @@
"animejs": "2.0.2",
"autwh": "0.0.1",
"bcryptjs": "2.4.3",
- "body-parser": "1.17.1",
+ "body-parser": "1.17.2",
"cafy": "2.4.0",
"chalk": "1.1.3",
"compression": "1.6.2",
"cors": "2.8.3",
"cropperjs": "1.0.0-rc",
"crypto": "0.0.3",
- "debug": "2.6.6",
+ "debug": "2.6.7",
"deep-equal": "1.0.1",
"deepcopy": "0.6.3",
"download": "6.1.0",
diff --git a/src/web/app/boot.js b/src/web/app/boot.js
index 59af08f8a2..5abbeba684 100644
--- a/src/web/app/boot.js
+++ b/src/web/app/boot.js
@@ -54,7 +54,7 @@ if (app == 'misskey') {
// Load an app script
// Note: 'async' makes can load the script asyncly.
-// 'defer' makes can run script when the dom loaded.
+// 'defer' makes can run the script when the dom loaded.
const script = document.createElement('script');
script.setAttribute('src', `/assets/${app}.${VERSION}.${lang}.js`);
script.setAttribute('async', 'true');