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
..
balancing_spec.rb	add spec for foodcoops/foodsoft#179	2013-10-02 16:32:01 +02:00
product_distribution_example_spec.rb	uses FactoryGirl helpers	2013-09-18 12:44:41 +02:00
session_spec.rb	allow to login with email instead of nick as well + tests	2013-09-20 22:39:19 +02:00
supplier_spec.rb	uses FactoryGirl helpers	2013-09-18 12:44:41 +02:00