projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-14-08-55-09
[civicrm-core.git]
/
bower.json
diff --git
a/bower.json
b/bower.json
index 92688b2619b8b46971ba1064e6cb11b110fde3f1..4ff9dbd0f11b6f4bb5b3ca20e7640246bf4a6c8b 100644
(file)
--- a/
bower.json
+++ b/
bower.json
@@
-20,7
+20,10
@@
"lodash-compat": "~3.0",
"google-code-prettify": "~1.0",
"select2": "colemanw/select2#stable/3.5",
"lodash-compat": "~3.0",
"google-code-prettify": "~1.0",
"select2": "colemanw/select2#stable/3.5",
- "jquery-validation": "~1.13"
+ "jquery-validation": "~1.13",
+ "datatables": "~1.10",
+ "ckeditor": "~4.4",
+ "font-awesome": "~4.3"
},
"resolutions": {
"angular": "~1.3.8"
},
"resolutions": {
"angular": "~1.3.8"