Merge branch 'dev' into fix/2106-followers

This commit is contained in:
Brenda Wallace
2019-09-05 12:02:13 +12:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -4,8 +4,8 @@ body {
}
section {
padding-top: 1em;
margin: 0;
padding-bottom: 1em;
}
.ellipsis {

View File

@@ -36,6 +36,6 @@
.row
.col-md-12
%hr/
= render 'plantings/harvests', planting: @planting
%section= render 'plantings/harvests', planting: @planting
%hr/
= render 'plantings/descendants', planting: @planting
%section= render 'plantings/descendants', planting: @planting