diff options
| author | re4k <re4k@re4k.info> | 2013-05-04 23:01:39 +0900 |
|---|---|---|
| committer | re4k <re4k@re4k.info> | 2013-05-04 23:01:39 +0900 |
| commit | bd2448b8d4e44ecfe5458a35b9a760c4625d5cc5 (patch) | |
| tree | dc63fad8f07383933e0122ba343fdb9415d1f617 /Gemfile.lock | |
| parent | 72635857e3e1446122d56e122c175bccdb2bf01b (diff) | |
| download | aclog-bd2448b8d4e44ecfe5458a35b9a760c4625d5cc5.tar.gz | |
change bootstrap-sass to bootstrap-sass-rails / bundle update
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 03e640f..22faaa8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,8 +30,9 @@ GEM activerecord (>= 3.0.0) arel (4.0.0) atomic (1.1.8) - bootstrap-sass (2.3.1.1) - sass (~> 3.2) + bootstrap-sass-rails (2.3.1.1) + railties (>= 3.1.0) + sass-rails (>= 3.1.0) builder (3.1.4) coffee-rails (4.0.0) coffee-script (>= 2.2.0) @@ -70,7 +71,7 @@ GEM hashie (2.0.4) hike (1.2.2) i18n (0.6.4) - jbuilder (1.3.0) + jbuilder (1.4.0) activesupport (>= 3.0.0) multi_json (>= 1.2.0) jquery-rails (2.2.1) @@ -82,7 +83,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.23) - minitest (4.7.3) + minitest (4.7.4) msgpack (0.5.4) multi_json (1.7.2) multipart-post (1.2.0) @@ -156,7 +157,7 @@ GEM thor (0.18.1) thread_safe (0.1.0) atomic - tilt (1.3.7) + tilt (1.4.0) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -181,7 +182,7 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass + bootstrap-sass-rails coffee-rails (~> 4.0.0.rc1) counter_culture daemon-spawn |