Brenda Wallace 8763c22284 Merge remote-tracking branch 'upstream/dev' into bw/indentation-for-great-glory ...

Conflicts:
	app/models/crop.rb

2016-11-29 02:33:30 +00:00

..

assets

Add a login splash

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

controllers

Spacing fixes

2016-11-26 12:13:17 +13:00

helpers

Spacing fixes

2016-11-26 12:13:17 +13:00

mailers

Removed extra empty blank lines

2016-11-26 12:06:02 +13:00

models

Merge remote-tracking branch 'upstream/dev' into bw/indentation-for-great-glory

2016-11-29 02:33:30 +00:00

validators

tests back to green

2015-02-09 22:41:35 +11:00

views

"[Member]'s garden" link to garden, not member

2016-11-27 10:21:11 +13:00