Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3

Conflicts: Gemfile
2012-11-24 15:27:48 +01:00 · 2012-11-24 15:27:48 +01:00 · 7c9d666909
commit 7c9d666909
parent ecc31641aa 4da1af614e
5 changed files with 12 additions and 5 deletions
--- a/6
+++ b/6
@ -36,4 +36,8 @@ gem 'meta_search'

 group :production do
  gem 'exception_notification', :require => 'exception_notifier'
-end
+end
+
+group :development do
+  gem 'sqlite3'
+end