Rohan Mitchell 4491d3cc73 Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix ...

Conflicts:
	app/views/admin/order_cycles/_row.html.haml
	spec/features/admin/order_cycles_spec.rb

2015-03-16 12:14:54 +11:00

..

admin

Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix

2015-03-16 12:14:54 +11:00

consumer

Redirect users to proper login page when they type /login

2015-03-05 11:25:35 +11:00