Benjamin Meichsner 71e02ab569 Merge branch 'rails3' into rails3-to-master ... Conflicts: app/views/suppliers/shared_suppliers.haml		2013-09-02 13:31:40 +02:00
..
assets	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00
controllers	Merge branch 'rails3' into rails3-to-master	2013-09-02 13:31:40 +02:00
documents	show header on fax PDF (closes bennibu#109)	2013-06-04 13:08:50 +02:00
helpers	Merge branch 'rails3' into rails3-to-master	2013-09-02 13:31:40 +02:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	also translate mail subjects	2013-05-07 13:28:14 +02:00
models	Merge branch 'rails3' into rails3-to-master	2013-09-02 13:31:40 +02:00
views	Merge branch 'rails3' into rails3-to-master	2013-09-02 13:31:40 +02:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00