Miles Gould bcb74c7ed8 Merge branch 'dev' into bump_ruby_22x

2016-05-19 14:15:33 +01:00

..

assets

Merge pull request #783 from pozorvlak/remove_last_count_calls

2015-08-05 18:57:04 +01:00

controllers

Fix bug #827 : Error in generating csv file for plantings with owner filter

2015-09-07 04:01:20 -04:00

helpers

Edit display_harvest_description method for no description

2016-04-08 17:34:58 -07:00

mailers

Check existence of secret token before using it.

2015-07-24 15:16:31 +01:00

models

Merge pull request #865 from CloCkWeRX/fix_progress

2016-04-21 08:02:37 +01:00

validators

tests back to green

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

views

Merge branch 'dev' into bump_ruby_22x

2016-05-19 14:15:33 +01:00