wvengen 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3 ... Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less app/controllers/stockit_controller.rb app/models/ordergroup.rb app/models/workgroup.rb app/views/stockit/index.html.haml		2013-03-06 01:01:12 +01:00
..
assets	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-06 01:01:12 +01:00
controllers	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-06 01:01:12 +01:00
documents	Show customer number in fax pdf	2013-01-30 19:46:18 +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-06 01:01:12 +01:00
views	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-06 01:01:12 +01:00
workers	Replaced delayed_job with resque. See README_DEVEL	2012-12-23 17:38:04 +01:00