mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-02-01 05:01:04 -05:00
Conflicts: Gemfile.lock app/assets/javascripts/application.js app/assets/stylesheets/application.sass app/assets/stylesheets/plantings.sass app/views/crops/_thumbnail.html.haml app/views/crops/show.html.haml app/views/home/_members.html.haml app/views/layouts/application.html.haml app/views/photos/show.html.haml app/views/plantings/_descendants.html.haml app/views/plantings/show.html.haml app/views/seeds/_thumbnail.html.haml app/views/shared/_global_actions.html.haml spec/models/crop_spec.rb