update font awesome

2016-08-19 18:26:06 -04:00
parent 437cb76314
commit 1e9297523a
29 changed files with 1667 additions and 58 deletions
--- a/bower.json
+++ b/bower.json
@@ -32,12 +32,15 @@
    "datatables": "~1.10.4",
    "datatables-plugins": "~1.0.1",
    "flot": "~0.8.3",
-    "font-awesome": "~4.2.0",
+    "font-awesome": "~4.6.3",
    "holderjs": "~2.4.1",
    "metisMenu": "~1.1.3",
    "morrisjs": "~0.5.1",
    "datatables-responsive": "1.0.6",
    "bootstrap-social": "~4.8.0",
    "flot.tooltip": "~0.8.4"
+  },
+  "resolutions": {
+    "font-awesome": "~4.6.3"
  }
 }