wvengen 2b511ee559 Merge branch 'master' into fresh-flow ... Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less		2013-12-18 17:03:26 +01:00
..
balancing	Merge branch 'master' into fresh-flow	2013-12-18 17:03:26 +01:00
financial_transactions	i18n cleanups (affects #137)	2013-11-23 12:05:29 +01:00
group_order_articles	Mark two i18n issues	2013-12-14 14:48:58 +01:00
invoices	i18n cleanup (affects foodcoops#137)	2013-12-12 00:13:19 +01:00
order_articles	Mark two i18n issues	2013-12-14 14:48:58 +01:00
ordergroups	i18n cleanup (affects foodcoops#137)	2013-12-12 00:13:19 +01:00
receive	make product redistribution work!	2013-11-27 00:06:25 +01:00
index.html.haml	i18n cleanup (affects foodcoops#137)	2013-12-12 00:13:19 +01:00