Merge branch 'master' of github.com:nextcloud/push into refactor/broa…

…dcast-to-mercure
nextcloud · Oct 22, 2019 · e3f6817 · e3f6817
2 parents 571b1c1 + 5f0ac87
commit e3f6817
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
  "eslint": "^5.16.0",
  "eslint-config-standard": "^12.0.0",
  "eslint-friendly-formatter": "^4.0.1",
- "eslint-loader": "^3.0.0",
+ "eslint-loader": "^3.0.2",
  "eslint-plugin-import": "^2.18.2",
  "eslint-plugin-node": "^10.0.0",
  "eslint-plugin-promise": "^4.2.1",