Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2018-09-03 23:23:55 +09:00
commit db3ae303cb
2 changed files with 2 additions and 2 deletions

View file

@ -54,7 +54,7 @@ Please visit https://www.google.com/recaptcha/intro/ and generate keys.
*(optional)* Generating VAPID keys *(optional)* Generating VAPID keys
---------------------------------------------------------------- ----------------------------------------------------------------
If you want to enable ServiceWroker, you need to generate VAPID keys: If you want to enable ServiceWorker, you need to generate VAPID keys:
Unless you have set your global node_modules location elsewhere, you need to run this in root. Unless you have set your global node_modules location elsewhere, you need to run this in root.
``` shell ``` shell

View file

@ -63,7 +63,7 @@ router.get('/apple-touch-icon.png', async ctx => {
}); });
}); });
// ServiceWroker // ServiceWorker
router.get(/^\/sw\.(.+?)\.js$/, async ctx => { router.get(/^\/sw\.(.+?)\.js$/, async ctx => {
await send(ctx, `/assets/sw.${ctx.params[0]}.js`, { await send(ctx, `/assets/sw.${ctx.params[0]}.js`, {
root: client root: client