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
..
de.yml	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
en.yml	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
fr.yml	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
nl.yml	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
overrides.yml	use rails-i18n translations	2013-10-17 16:43:14 +02:00