wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 ... Conflicts: app/controllers/admin/ordergroups_controller.rb app/controllers/finance/balancing_controller.rb app/controllers/suppliers_controller.rb app/views/articles/_article.html.haml app/views/finance/balancing/_summary.haml app/views/finance/balancing/new.html.haml app/views/group_orders/_form.html.haml app/views/home/_apple_bar.html.haml app/views/suppliers/index.haml		2013-03-21 22:08:09 +01:00
..
assets	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
controllers	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
documents	Fixed bug in fax template when there are missing supplier infos.	2013-03-17 18:10:48 +01:00
helpers	Revert 099e2b9b06	2013-02-25 10:29:47 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	Set host infos for urls in emails via app_config.	2012-12-28 13:55:18 +01:00
models	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
views	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
workers	Replaced delayed_job with resque. See README_DEVEL	2012-12-23 17:38:04 +01:00