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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3e029481eeb..30e89e90d8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -152,7 +152,7 @@ GEM net-ssh (>= 2.1.3) fog-json (1.0.0) multi_json (~> 1.0) - font-awesome-rails (3.2.1.3) + font-awesome-rails (4.2.0.0) railties (>= 3.2, < 5.0) foreman (0.63.0) dotenv (>= 0.7) @@ -614,7 +614,7 @@ DEPENDENCIES factory_girl_rails ffaker fog (~> 1.14) - font-awesome-rails (~> 3.2) + font-awesome-rails (~> 4.2) foreman gemnasium-gitlab-service (~> 0.2) github-markup |