Brenda Wallace 986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up ...

Conflicts:
	app/views/layouts/_header.html.haml
	spec/features/gardens/actions_spec.rb

2019-01-24 13:48:36 +13:00

..

images

Add a login splash

2016-11-25 09:44:12 +10:00

javascripts

Put displayed member back to using member.slug

2019-01-18 20:00:59 +13:00

stylesheets

Tidied up the planting actions on gardens#index

2019-01-24 12:17:40 +13:00