Merge pull request #15089 from totten/5.17-install-msg
[civicrm-core.git] / bower.json
index c4aaaa21526f2fdbdf86aca5ca65d78e68520987..75e67552ef9e45a1fb85bc5491478d3526c406ee 100644 (file)
@@ -18,7 +18,7 @@
     "d3-3.5.x": "d3#~3.5.17",
     "dc-2.1.x": "dc.js#~2.1.8",
     "crossfilter-1.3.x": "crossfilter2#~1.3.11",
-    "jquery": "civicrm/jquery#1.12.4-civicrm-1.1",
+    "jquery": "civicrm/jquery#1.12.4-civicrm-1.2",
     "jquery-ui": "~1.12",
     "lodash-compat": "~3.0",
     "google-code-prettify": "~1.0",
     "angular-sanitize": "~1.5.0",
     "smartmenus": "~1.1",
     "phantomjs-polyfill": "^0.0.2",
-    "es6-promise": "^4.2.4"
+    "es6-promise": "^4.2.4",
+    "angular-xeditable": "^0.9.0",
+    "checklist-model": "~1",
+    "css-color-names": "~1"
   },
   "resolutions": {
     "angular": "~1.5.11",
-    "jquery": "1.12.4-civicrm-1.1"
+    "jquery": "1.12.4-civicrm-1.2"
   }
 }