diff --git a/Gemfile.lock b/Gemfile.lock index 7d29085..c59f4cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,9 +58,8 @@ GEM execjs (1.4.0) multi_json (~> 1.0) fastercsv (1.5.5) - font-awesome-sass-rails (3.0.2.2) - railties (>= 3.1.1) - sass-rails (>= 3.1.1) + font-awesome-rails (3.1.1.2) + railties (>= 3.2, < 5.0) geokit (1.6.5) multi_json haml (4.0.3) @@ -109,13 +108,13 @@ GEM activesupport (= 3.2.13) bundler (~> 1.0) railties (= 3.2.13) - rails_admin (0.4.8) + rails_admin (0.4.9) bootstrap-sass (~> 2.2) builder (~> 3.0) - coffee-rails (~> 3.1) - font-awesome-sass-rails (~> 3.0, >= 3.0.0.1) + coffee-rails (>= 3.1, < 5) + font-awesome-rails (~> 3.0) haml (~> 4.0) - jquery-rails (~> 2.1) + jquery-rails (>= 2.1, < 4) jquery-ui-rails (~> 3.0) kaminari (~> 0.14) nested_form (~> 0.3)