Merge branch 'bug/62-missing-resolve-in-bower-json' into dev

clarity-h2020 · Nov 7, 2014 · 9ba3410 · 9ba3410
2 parents 7c8a68f + 4c40926
commit 9ba3410
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -44,7 +44,7 @@
   "resolutions": {
     "bootstrap": "3.3.0",
     "d3": "3.3.6",
-    "icmm_js": "1.1.0",
+    "icmm_js": "1.1.1",
     "angular": "1.2.25"
   }
 }