Merge branch 'master' into greenkeeper/parcel-plugin-web-extension-1.5.2

senelway · Mar 11, 2019 · 3a5fca1 · 3a5fca1
2 parents 78eb46a + 7507e0e
commit 3a5fca1
Show file tree

Hide file tree

Showing 2 changed files with 982 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -15,5 +15,6 @@
   "devDependencies": {
     "parcel-bundler": "^1.11.0",
     "parcel-plugin-web-extension": "^1.5.2"
+    "parcel-bundler": "^1.12.0"
   }
 }