Benjamin Meichsner 857eb64a45 Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion ... Keep member order on orderarticle deletion		2013-09-18 08:32:33 -07:00
..
assets	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00
controllers	remember what member ordered when deleted in balancing screen	2013-09-17 14:19:46 +02:00
documents	sort ordergroups in order screen and pdfs	2013-09-17 00:25:38 +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 'order-display-improvements' of https://github.com/foodcoop-adam/foodsoft into foodcoop-adam-order-display-improvements	2013-09-18 17:16:04 +02:00
views	sort ordergroups in order screen and pdfs	2013-09-17 00:25:38 +02:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00