diff --git a/Gemfile.lock b/Gemfile.lock index e4b3cb8..13611a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,8 +67,6 @@ GEM treetop (~> 1.4.8) mime-types (1.16) multi_json (1.0.3) - mysql2 (0.3.11) - mysql2 (0.3.11-x86-mingw32) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -86,8 +84,10 @@ GEM fastthread (>= 1.0.1) rack rake (>= 0.8.1) + pg (1.3.5) + pg (1.3.5-x86-mingw32) polyglot (0.3.2) - rack (1.3.3) + rack (1.3.10) rack-cache (1.0.3) rack (>= 0.4) rack-mount (0.8.3) @@ -149,9 +149,9 @@ DEPENDENCIES capistrano coffee-rails (~> 3.1.0) jquery-rails - mysql2 paperclip passenger + pg rails (= 3.1.0) sass-rails (~> 3.1.0) sqlite3