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 94f36433ff1431c6f3e2d494da20705a8f750f47..4ff9dbd0f11b6f4bb5b3ca20e7640246bf4a6c8b 100644 (file)
--- a/bower.json
+++ b/bower.json
@@ -22,7 +22,8 @@
     "select2": "colemanw/select2#stable/3.5",
     "jquery-validation": "~1.13",
     "datatables": "~1.10",
-    "ckeditor": "~4.4"
+    "ckeditor": "~4.4",
+    "font-awesome": "~4.3"
   },
   "resolutions": {
     "angular": "~1.3.8"