diff options
| author | Jason Croft | 2016-05-12 12:32:10 -0400 |
|---|---|---|
| committer | Jason Croft | 2016-05-12 12:32:10 -0400 |
| commit | e65d43bd81dc9af9be0c6df599800bc3ccf15a5e (patch) | |
| tree | 99f23b8a7d3885ca440ae952e6034da56c9d83f5 /bower.json | |
| parent | 30e602a7400f3b38918a55f1470610b8d4ee49d7 (diff) | |
| parent | 4aa4e3eacc36ae54c49ac94cf40594f33c4d9b1d (diff) | |
Merge remote-tracking branch 'origin/master' into gitlab_snippets
# Conflicts:
# bower.json
# public/views/body.ejs
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,7 +20,7 @@ "dependencies": { "bootstrap": "~3.3.6", "jquery": "~1.11.3", - "font-awesome": "~4.6.0", + "font-awesome": "~4.6.2", "Ionicons": "ionicons#~2.0.1", "reveal.js": "~3.2.0", "gsap": "greensock#~1.18.0", |