wvengen eef4626107 Merge branch 'master' into updated-gems ... Conflicts: Gemfile.lock app/views/deliveries/_form.html.haml		2013-07-17 11:04:28 +02:00
..
assets	Merge branch 'master' into updated-gems	2013-07-17 11:04:28 +02:00
controllers	Merge branch 'master' into improve-delivery-workflow-further	2013-07-13 21:08:50 +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 pull request #141 from foodcoop-rostock/improve-delivery-workflow-further	2013-07-17 01:43:59 -07:00
views	Merge branch 'master' into updated-gems	2013-07-17 11:04:28 +02:00
workers	make resque worker function on non-multi-coop-installs too	2013-06-29 01:48:57 +02:00