diff options
| author | mo khan <mo@mokhan.ca> | 2013-07-22 12:32:22 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2013-07-22 12:33:39 -0600 |
| commit | 46f5fd46aa5c5397e22d530acbdb1a4a2c2f31f9 (patch) | |
| tree | 63dad6569095f81ea8d55b7d2ad3ebba3cabd089 /Gemfile.lock | |
| parent | b48902691afcbd119d68fa24004cda05c191a667 (diff) | |
| parent | ea7fc20849abc6f516ab7cb78b679c928efe4cac (diff) | |
merge conflict with master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4a48b58..e4af723 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GEM tzinfo (~> 0.3.37) arel (4.0.0) atomic (1.1.10) - bootstrap-sass (2.3.2.0) + bootstrap-sass (2.3.2.1) sass (~> 3.2) builder (3.1.4) capybara (2.1.0) @@ -68,6 +68,7 @@ GEM gibbon (0.4.6) httparty multi_json (>= 1.3.4) + high_voltage (1.2.4) hike (1.2.3) http_parser.rb (0.5.3) httparty (0.11.0) @@ -122,7 +123,7 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rspec-core (2.14.3) + rspec-core (2.14.4) rspec-expectations (2.14.0) diff-lcs (>= 1.1.3, < 2.0) rspec-fakes (0.0.9) @@ -194,6 +195,7 @@ DEPENDENCIES dotenv-rails factory_girl_rails gibbon + high_voltage (~> 1.2.1) jbuilder (~> 1.2) jquery-rails pg |