Julius 524819b86f Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3 ... Conflicts: app/helpers/application_helper.rb		2013-01-27 22:01:53 +01:00
..
_form.html.haml	Fixed stockit.	2012-10-29 18:28:17 +01:00
edit.html.haml	Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.	2009-02-11 18:09:04 +01:00
index.html.haml	Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3	2013-01-27 22:01:53 +01:00
new.html.haml	Temporairly deactivated helper in new delivery form.	2013-01-26 15:57:29 +01:00