Merge branch 'master' of github.com:ZeusWPI/Tab
This commit is contained in:
commit
f942157a2c
2 changed files with 2 additions and 2 deletions
2
Gemfile
2
Gemfile
|
@ -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
|
||||||
|
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue