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
..
_header.html.haml	use i18n-js	2013-10-04 15:01:10 +02:00
application.html.haml	start of making nickname optional	2013-09-20 22:40:13 +02:00
email.text.haml	finish layouts i18n, use help url from config, use html language from locale	2013-02-05 12:11:29 +01:00
login.html.haml	finish layouts i18n, use help url from config, use html language from locale	2013-02-05 12:11:29 +01:00