X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=bower.json;h=80a5dbc3adee55847c6303d40f6dd10339eed05b;hb=8714579bcae2e6eb99467c30d63706a36719342d;hp=e40429345d856401fef94a3cfb949329ad9531ca;hpb=fe1f07566a533c23e40b453bf6eb8972d46c6e5a;p=civicrm-core.git

diff --git a/bower.json b/bower.json
index e40429345d..80a5dbc3ad 100644
--- a/bower.json
+++ b/bower.json
@@ -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": "~1.12",
+    "jquery": "civicrm/jquery#1.12.4-civicrm-1.2",
     "jquery-ui": "~1.12",
     "lodash-compat": "~3.0",
     "google-code-prettify": "~1.0",
@@ -31,9 +31,12 @@
     "angular-bootstrap": "^2.5.0",
     "angular-sanitize": "~1.5.0",
     "smartmenus": "~1.1",
-    "phantomjs-polyfill": "^0.0.2"
+    "phantomjs-polyfill": "^0.0.2",
+    "es6-promise": "^4.2.4",
+    "angular-xeditable": "^0.9.0"
   },
   "resolutions": {
-    "angular": "~1.5.11"
+    "angular": "~1.5.11",
+    "jquery": "1.12.4-civicrm-1.2"
   }
 }