midgard
/
tab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Ilion Beyst 2015-09-08 15:06:45 +02:00
parent 326ab59de5 308c089c7d
commit 1c1a3646ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

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

4
Gemfile.lock
View File

@ -112,7 +112,7 @@ GEM
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
mysql2 (0.4.0)
mysql2 (0.3.20)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
@ -238,7 +238,7 @@ DEPENDENCIES
faker
jbuilder (~> 2.0)
jquery-rails
mysql2 (~> 0.3)
mysql2 (~> 0.3.0)
omniauth-oauth2
purecss-rails
rails (= 4.2.4)