Clone
Carlos Lubbers <carlos.lubbers@deltares.nl>
committed
on 25 Sep 18
Merge branch 'master' into 1842
# Conflicts:
# Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroSta… Show more
Merge branch 'master' into 1842

# Conflicts:

#       Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs

Show less

master + 23 more