projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80b41f5
)
Update bower.json to target fixed jquery branch for dev/core#969
author
Seamus Lee
<seamuslee001@gmail.com>
Thu, 30 May 2019 02:07:11 +0000
(12:07 +1000)
committer
Seamus Lee
<seamuslee001@gmail.com>
Thu, 30 May 2019 02:07:11 +0000
(12:07 +1000)
bower.json
patch
|
blob
|
blame
|
history
diff --git
a/bower.json
b/bower.json
index c4aaaa21526f2fdbdf86aca5ca65d78e68520987..9b1b32b524da44ecaac6ddeee54c0a765f89b886 100644
(file)
--- 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": "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
"
}
}