diff options
author | Geremia Taglialatela <tagliala.dev@gmail.com> | 2014-08-20 20:52:15 +0400 |
---|---|---|
committer | Geremia Taglialatela <tagliala.dev@gmail.com> | 2014-08-20 20:52:15 +0400 |
commit | 54059745fcd162a902b16c7de8a860c5b0edf8a8 (patch) | |
tree | 48af13bc92153fa094c9464ef798b48647ac52d7 /bower.json | |
parent | b3f34507b27b401834515f950383f1650398a3f1 (diff) | |
parent | 97404ab77d41c70c69da482990c60b9aa7bf1944 (diff) |
merged conflicts
Diffstat (limited to 'bower.json')
-rw-r--r-- | bower.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bower.json b/bower.json index 60bcb67e5..14f199841 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "font-awesome", "description": "Font Awesome", - "version": "4.1.0", + "version": "4.1.1", "keywords": [], "homepage": "http://fontawesome.io", "dependencies": {}, |