From e1794d89de328f86315f3fdd20ea994a425fff25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 6 Dec 2012 20:06:30 +0100 Subject: [PATCH] bump bootstrap-sass --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 82d71cea6..a91e14e78 100644 --- a/Gemfile +++ b/Gemfile @@ -108,7 +108,7 @@ gem 'gon', '4.0.1' # assets group :assets do - gem 'bootstrap-sass', '2.1.1.0' + gem 'bootstrap-sass', '2.2.2.0' gem 'sass-rails', '3.2.5' # Windows and OSX have an execjs compatible runtime built-in, Linux users should diff --git a/Gemfile.lock b/Gemfile.lock index 5be8030d0..42e0af53b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,7 +59,8 @@ GEM activemodel fog bcrypt-ruby (3.0.1) - bootstrap-sass (2.1.1.0) + bootstrap-sass (2.2.2.0) + sass (~> 3.2) builder (3.0.4) capistrano (2.12.0) highline @@ -418,7 +419,7 @@ DEPENDENCIES acts_as_api (= 0.4.1) addressable (= 2.3.2) asset_sync (= 0.5.0) - bootstrap-sass (= 2.1.1.0) + bootstrap-sass (= 2.2.2.0) capistrano (= 2.12.0) capistrano_colors (= 0.5.5) capybara (= 1.1.3)