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
..
assets	Merge branch 'master' into i18n	2013-10-18 12:30:34 +02:00
controllers	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	user display changes in model and mailer	2013-09-22 14:38:56 +02:00
models	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
views	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00