wvengen bb20e9abea Merge branch 'master' into tests-rspec ... Conflicts: Gemfile Gemfile.lock		2013-07-24 21:25:36 +02:00
..
assets	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00
controllers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00
documents	show header on fax PDF (closes bennibu#109)	2013-06-04 13:08:50 +02:00
helpers	Merge branch 'master' into improve-delivery-workflow-further	2013-07-13 21:08:50 +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 'master' into tests-rspec	2013-07-24 21:25:36 +02:00
views	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00