diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3fb1193..e8a9831 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,8 @@ GEM multi_json (~> 1.0) addressable (2.3.5) arel (3.0.3) - bootstrap-sass (2.1.1.0) + bootstrap-sass (2.3.2.2) + sass (~> 3.2) bootswatch-rails (0.5.0) railties (>= 3.1) braintree (2.27.1) @@ -212,6 +213,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.1.1) + rdiscount (2.0.7) rdoc (3.12.2) json (~> 1.4) rest-client (1.6.7) @@ -262,7 +264,7 @@ PLATFORMS DEPENDENCIES SyslogLogger (~> 2.0) - bootstrap-sass (~> 2.1.0) + bootstrap-sass (= 2.3.2.2) bootswatch-rails (~> 0.5.0) capybara certificate_authority! @@ -290,6 +292,7 @@ DEPENDENCIES poltergeist quiet_assets rails-i18n + rdiscount sass-rails (~> 3.2.5) simple_form therubyracer (~> 0.10.2) |