wvengen c37ed74942 Merge branch 'master' into allow-no-nickname ... Conflicts: app/views/foodcoop/users/_users.html.haml		2013-10-29 19:15:52 +01:00
..
balancing	start of making nickname optional	2013-09-20 22:40:13 +02:00
financial_transactions	Merge branch 'master' into allow-no-nickname	2013-10-29 19:15:52 +01:00
group_order_articles	add missing i18n	2013-10-04 10:25:53 +02:00
invoices	i18n simple_form move of invoices	2013-10-09 23:37:08 +02:00
order_articles	add missing i18n	2013-10-04 10:25:53 +02:00
ordergroups	fix i18n buglets (closes #167)	2013-09-10 10:27:13 +02:00
index.html.haml	move commonly used verbs to common i18n identifier	2013-04-04 02:49:52 +02:00