wvengen c37ed74942 Merge branch 'master' into allow-no-nickname ... Conflicts: app/views/foodcoop/users/_users.html.haml		2013-10-29 19:15:52 +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	allow to login with email instead of nick as well + tests	2013-09-20 22:39:19 +02:00
support	uses FactoryGirl helpers	2013-09-18 12:44:41 +02:00
i18n_spec.rb	fix i18n spec after changes	2013-10-17 17:10:33 +02:00
spec_helper.rb	uses FactoryGirl helpers	2013-09-18 12:44:41 +02:00