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

This commit is contained in:
Ilion Beyst 2015-09-08 15:14:50 +02:00
commit f942157a2c
2 changed files with 2 additions and 2 deletions

View file

@ -71,5 +71,5 @@ group :development do
end end
group :production do group :production do
gem 'mysql2', '~> 0.3.0' # Database gem 'mysql2'
end end

View file

@ -244,7 +244,7 @@ DEPENDENCIES
jbuilder (~> 2.0) jbuilder (~> 2.0)
jquery-datatables-rails (~> 3.3.0) jquery-datatables-rails (~> 3.3.0)
jquery-rails jquery-rails
mysql2 (~> 0.3.0) mysql2
omniauth-oauth2 omniauth-oauth2
purecss-rails purecss-rails
rails (= 4.2.4) rails (= 4.2.4)