Merge branch 'master' of github.com:ZeusWPI/Tab

This commit is contained in:
Tom Naessens 2015-09-01 15:06:25 +02:00
commit 71db4d600b

View file

@ -69,6 +69,9 @@ GEM
capistrano-rails (1.1.2)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rbenv (2.0.3)
capistrano (~> 3.1)
sshkit (~> 1.3)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
@ -288,6 +291,7 @@ DEPENDENCIES
capistrano (~> 3.1)
capistrano-passenger
capistrano-rails (~> 1.1)
capistrano-rbenv
capistrano-rvm
capybara
codeclimate-test-reporter
@ -314,3 +318,6 @@ DEPENDENCIES
tzinfo-data
uglifier (>= 1.3.0)
will_paginate (= 3.0.7)
BUNDLED WITH
1.10.5