Brenda Wallace 32b2cbd921 Merge branch 'button-translate' into routes-tidy-up ...

Conflicts:
	app/views/crops/_search_bar.haml
	app/views/layouts/application.html.haml

2019-01-24 13:49:53 +13:00

..

_footer.html.haml

Fix up footer

2018-06-04 16:44:51 +12:00

_header.html.haml

Merge remote-tracking branch 'upstream/dev' into routes-tidy-up

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

_meta.html.haml

Haml cleanup for layout

2017-02-13 07:33:48 +13:00

_nav.haml

DRY the nav bars and make all the same

2019-01-06 08:45:42 +13:00

application.html.haml

DRY actions more

2019-01-24 13:46:35 +13:00

mailer.html.erb

Application mailer for rails 5

2018-01-03 17:18:41 +13:00

mailer.text.erb

Application mailer for rails 5

2018-01-03 17:18:41 +13:00