Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap

Browse source 
Conflicts:
	Gemfile
This commit is contained in:
Robert Waltemath 2012-11-15 09:53:36 +01:00
commit 1822b330d1
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -18,6 +18,7 @@ end
gem 'jquery-rails'
gem 'mysql2'
gem 'sqlite3', :group => :development
gem 'prawn'
gem 'haml-rails'
gem 'kaminari'
@ -36,4 +37,4 @@ gem 'meta_search'
group :production do
gem 'exception_notification', :require => 'exception_notifier'
end
end