Merge branch 'master' of github.com:ZeusWPI/Tab
This commit is contained in:
commit
1c1a3646ff
2 changed files with 3 additions and 3 deletions
2
Gemfile
2
Gemfile
|
@ -69,5 +69,5 @@ group :development do
|
||||||
end
|
end
|
||||||
|
|
||||||
group :production do
|
group :production do
|
||||||
gem 'mysql2', '~> 0.3' # Database
|
gem 'mysql2', '~> 0.3.0' # Database
|
||||||
end
|
end
|
||||||
|
|
|
@ -112,7 +112,7 @@ GEM
|
||||||
multi_json (1.11.2)
|
multi_json (1.11.2)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
mysql2 (0.4.0)
|
mysql2 (0.3.20)
|
||||||
net-scp (1.2.1)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (2.9.2)
|
net-ssh (2.9.2)
|
||||||
|
@ -238,7 +238,7 @@ DEPENDENCIES
|
||||||
faker
|
faker
|
||||||
jbuilder (~> 2.0)
|
jbuilder (~> 2.0)
|
||||||
jquery-rails
|
jquery-rails
|
||||||
mysql2 (~> 0.3)
|
mysql2 (~> 0.3.0)
|
||||||
omniauth-oauth2
|
omniauth-oauth2
|
||||||
purecss-rails
|
purecss-rails
|
||||||
rails (= 4.2.4)
|
rails (= 4.2.4)
|
||||||
|
|
Loading…
Reference in a new issue