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
..
factories	uses FactoryGirl helpers	2013-09-18 12:44:41 +02:00
integration	Merge branch 'master' into allow-no-nickname	2013-10-29 19:15:52 +01:00
models	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
support	add unit tests for shared database synchronisation	2013-11-13 23:09:17 +01:00
i18n_spec.rb	fix i18n spec after changes	2013-10-17 17:10:33 +02:00
spec_helper.rb	fix last commit for non-js tests	2013-10-30 01:28:59 +01:00