wvengen 0abb63279f Merge branch 'master' into updated-gems ... Conflicts: Gemfile.lock		2013-09-18 13:00:26 +02:00
..
assets	Merge branch 'master' into updated-gems	2013-07-18 20:28:56 +02:00
controllers	Merge branch 'rails3' into rails3-to-master	2013-09-02 13:31:40 +02:00
documents	add total to order pdf, layout changes (closes foodcoops/foodsoft#138)	2013-09-10 11:59:32 +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 pull request #163 from foodcoop-rostock/order-tasks-alphabetically	2013-09-17 05:45:13 -07:00
views	Merge branch 'master' into updated-gems	2013-09-18 13:00:26 +02:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00