Permalink
Browse files

Merge remote-tracking branch 'santa/master' into mysql

  • Loading branch information...
2 parents cebbe7f + 83cb973 commit cb3307d685aadb1d46ec03e4852ac4903bb962f8 @mockdeep mockdeep committed Sep 17, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 Gemfile
  2. +1 −1 config/database.yml.example
View
@@ -34,7 +34,7 @@ end
group :development do
gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'pg'
- gem 'mysql2', :git => 'https://github.com/brianmario/mysql2.git', :ref => '0.2.x'
+ gem 'mysql2', '< 0.3'
gem 'guard-rspec'
gem 'spork', '0.8.5'
gem 'guard-spork'
@@ -1,5 +1,5 @@
production:
- adapter: mysql
+ adapter: mysql2
database: bettermeans_production
host: localhost
username: root

0 comments on commit cb3307d

Please sign in to comment.