From 200b409c26a6682697832ff77c319b2e5f9971a6 Mon Sep 17 00:00:00 2001 From: Godwin Date: Sun, 16 Jul 2017 19:45:17 -0700 Subject: [PATCH] Merged with development --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 0fec91c..43a7aac 100644 --- a/Gemfile +++ b/Gemfile @@ -30,8 +30,8 @@ gem 'launchy' # bundle config local.lingua_franca ../lingua_franca # bundle config local.marmara ../marmara gem 'bikecollectives_core', git: 'https://github.com/bikebike/bikecollectives_core.git', branch: 'master' -gem 'bumbleberry', git: 'https://github.com/bumbleberry/bumbleberry.git', branch: '2017' -gem 'lingua_franca', git: 'https://github.com/lingua-franca/lingua_franca.git', branch: '2017' +gem 'bumbleberry', git: 'https://github.com/bumbleberry/bumbleberry.git', branch: 'master' +gem 'lingua_franca', git: 'https://github.com/lingua-franca/lingua_franca.git', branch: 'master' gem 'marmara', git: 'https://github.com/lingua-franca/marmara.git', branch: 'master' # Bike!Bike! specific stuff