foodsoft/db
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
..
migrate Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
schema.rb allow to login with email instead of nick as well + tests 2013-09-20 22:39:19 +02:00
seeds.rb Added seeds.rb for an easy start. 2011-05-06 20:23:33 +02:00