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
..
ordergroups	start of making nickname optional	2013-09-20 22:40:13 +02:00
users	Merge branch 'master' into allow-no-nickname	2013-10-29 19:15:52 +01:00
workgroups	move commonly used verbs to common i18n identifier	2013-04-04 02:49:52 +02:00