wvengen bdce1b5872 Merge branch 'master' into updated-gems ... Conflicts: Gemfile Gemfile.lock		2013-10-09 10:37:02 +02:00
..
assets	Merge branch 'master' into updated-gems	2013-10-09 10:37:02 +02:00
controllers	Move StockArticle#history to StockArticle#show	2013-10-03 22:24:21 +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	show lines with zero units but with member orders in balancing screen (closes foodcoops/foodsoft#179)	2013-10-02 16:32:29 +02:00
views	Merge branch 'master' into updated-gems	2013-10-09 10:37:02 +02:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00