X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=bower.json;h=c4aaaa21526f2fdbdf86aca5ca65d78e68520987;hb=e4dc837fc64548ef79dd06dd71cfd9e9ec860621;hp=e40429345d856401fef94a3cfb949329ad9531ca;hpb=64089c0f213c1d4c08e9f9faa3390a173d5c4a37;p=civicrm-core.git diff --git a/bower.json b/bower.json index e40429345d..c4aaaa2152 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.1", "jquery-ui": "~1.12", "lodash-compat": "~3.0", "google-code-prettify": "~1.0", @@ -31,9 +31,11 @@ "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" }, "resolutions": { - "angular": "~1.5.11" + "angular": "~1.5.11", + "jquery": "1.12.4-civicrm-1.1" } }