Merge branch 'master' into master

edfungus · Mar 25, 2017 · baa08fe · baa08fe
2 parents b04a547 + b20b93c
commit baa08fe
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/bower.json b/bower.json
@@ -56,6 +56,10 @@
     "paper-progress": "PolymerElements/paper-progress#^1.0.0",
     "paper-slider": "PolymerElements/paper-slider",
     "paper-toast": "PolymerElements/paper-toast",
-    "paper-toggle-button": "PolymerElements/paper-toggle-button"
+    "paper-toggle-button": "PolymerElements/paper-toggle-button",
+    "polymer": "Polymer/polymer#~1.4.0"
+  },
+  "resolutions": {
+    "polymer": "^1.1.0"
   }
 }