Julius Rapp a5565b436f Resolve merge conflicts		2013-07-07 14:58:57 +02:00
..
assets	Resolve merge conflicts	2013-07-07 14:58:57 +02:00
controllers	Resolve merge conflicts	2013-07-07 14:58:57 +02:00
documents	show header on fax PDF (closes bennibu#109)	2013-06-04 13:08:50 +02:00
helpers	Fix ordering of stock_changes in delivery 2	2013-06-27 09:10:46 +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 latest changes in master of http://github.com/foodcoops/foodsoft	2013-06-26 20:23:11 +02:00
views	Resolve merge conflicts	2013-07-07 14:58:57 +02:00
workers	make resque worker function on non-multi-coop-installs too	2013-06-29 01:48:57 +02:00