diff --git a/Gemfile b/Gemfile index 3328c8f2f0..af0d5d30dc 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '3.2.8' gem 'pg' gem 'spree', '1.1.3' gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git' -gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git' +gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git', :branch => '1-1-stable' gem 'spree_last_address', :git => 'git://github.com/dancinglightning/spree-last-address.git' diff --git a/Gemfile.lock b/Gemfile.lock index 02deb13906..2c8b08631d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,9 +31,11 @@ GIT GIT remote: git://github.com/spree/spree_paypal_express.git - revision: d48f4649506e876b88244dcb4e5a86250e4ef8f0 + revision: 2c61f1700ef853e3d4f39739793dc3308422e94b + branch: 1-1-stable specs: spree_paypal_express (1.1.0) + spree_auth (>= 1.0.0) spree_core (>= 1.0.0) GEM @@ -93,7 +95,7 @@ GEM nokogiri (>= 1.4.4) uuidtools (~> 2.1) bcrypt-ruby (3.0.1) - braintree (2.16.0) + braintree (2.17.0) builder (>= 2.0.0) bugsnag (1.1.2) httparty (~> 0.8.3)