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
..
_archive_tasks.html.haml
_form.html.haml
_list.haml
_nav.haml
archive.haml
archive.js.haml
edit.haml
index.haml
new.haml
show.haml
user.html.haml
workgroup.haml