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

Conflicts:
	app/helpers/application_helper.rb
This commit is contained in:
Julius 2013-01-27 22:01:53 +01:00
commit 524819b86f
12 changed files with 73 additions and 50 deletions

View file

@ -0,0 +1,6 @@
if defined? Bullet
Bullet.enable = true
# Bullet.alert = true
Bullet.bullet_logger = true
Bullet.console = true
end