Brenda Wallace
8e0b7d9ded
Merge branch 'charts' into upgrade/rails-5
Conflicts:
app/assets/javascripts/crops.js.erb
spec/controllers/comments_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/models/post_spec.rb
spec/views/home/_crops.html.haml_spec.rb
2018-01-11 08:34:20 +13:00
..
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2018-01-09 02:00:40 +00:00
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2017-11-19 11:13:41 +13:00
2017-12-17 11:40:55 +13:00
2018-01-09 02:00:40 +00:00
2018-01-03 17:12:17 +13:00
2018-01-11 08:34:20 +13:00
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2018-01-03 17:12:17 +13:00
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2018-01-09 02:00:40 +00:00
2018-01-11 08:34:20 +13:00
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2017-11-17 16:51:24 +00:00
2017-12-17 11:40:55 +13:00
2018-01-03 17:12:17 +13:00