Unverified Commit 108dbdf3 authored by Eileen McNaughton's avatar Eileen McNaughton Committed by GitHub

Merge pull request #14378 from seamuslee001/dev_core_969

Update bower.json to target fixed jquery branch for #969
parents 80b41f56 49eadc07
......@@ -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",
......@@ -36,6 +36,6 @@
},
"resolutions": {
"angular": "~1.5.11",
"jquery": "1.12.4-civicrm-1.1"
"jquery": "1.12.4-civicrm-1.2"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment