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
..
_apple_bar.html.haml	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
_start_nav.haml	fix and cleanup routing (closes foodcoops#190)	2013-10-30 02:27:04 +01:00
index.html.haml	start of making nickname optional	2013-09-20 22:40:13 +02:00
ordergroup.html.haml	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
ordergroup.js.haml	Removed fancybox. Fixed profile, my ordergroup and tasks.	2012-11-12 09:18:44 +01:00
profile.html.haml	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00