Brenda Wallace 5e0cff5b8e Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces ...

Conflicts:
	app/helpers/seeds_helper.rb
	spec/support/controller_macros.rb

2016-11-17 19:04:44 +13:00

..

application_helper.rb

Removed extra blank lines, & added a end of file

2016-11-16 12:52:48 +13:00

auto_suggest_helper.rb

Fixed various problems with search matching

2015-02-17 19:20:25 +11:00

crops_helper.rb

Change hash syntax

2016-06-09 11:57:56 -03:00

gardens_helper.rb

Fix another whitespace problem.

2015-07-24 11:09:22 +01:00

harvests_helper.rb

Display one line of description in harvest card, then go to ellipsis and put read more on next line

2016-05-26 23:08:23 -04:00

notifications_helper.rb

$ rubocop --only HashSyntax --auto-correct

2016-05-19 15:53:11 -04:00

plantings_helper.rb

Added sunniness icons on plantings/_thumbnail and show page

2015-07-10 11:17:11 +08:00

seeds_helper.rb

Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces

2016-11-17 19:04:44 +13:00