wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname ... Conflicts: app/views/home/ordergroup.html.haml app/views/login/new_password.html.haml app/views/shared/_auto_complete_users.rhtml app/views/shared/memberships/_current_members.rhtml app/views/shared/memberships/_non_members.rhtml		2013-11-18 11:42:49 +01:00
..
accept_invitation.html.haml	fix typo breaking invitation	2013-09-20 23:15:44 +02:00
forgot_password.html.haml	fix and cleanup routing (closes foodcoops#190)	2013-10-30 02:27:04 +01:00
new_password.html.haml	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00