diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 13:42:24 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 13:42:24 +0300 |
commit | 0676f1da7e1787594ccb5d839619a40ff134596f (patch) | |
tree | e11678285d1097ac365045f2f483e475ef04132c /Gemfile | |
parent | ac6f0321227c3df4ed9a255eccaaafa2d9527d4b (diff) | |
parent | 5d8be4438add1183d91e030b852c628cf09f4916 (diff) | |
download | gitlab-ce-0676f1da7e1787594ccb5d839619a40ff134596f.tar.gz |
Merge pull request #7934 from Soullivaneuh/font-awesome
Upgrade to Font Awesome v4.2
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -180,7 +180,7 @@ gem "jquery-ui-rails" gem "jquery-scrollto-rails" gem "raphael-rails", "~> 2.1.2" gem 'bootstrap-sass', '~> 3.0' -gem "font-awesome-rails", '~> 3.2' +gem "font-awesome-rails", '~> 4.2' gem "gitlab_emoji", "~> 0.0.1.1" gem "gon", '~> 5.0.0' gem 'nprogress-rails' |