Clone
Carlos Lubbers <carlos.lubbers@deltares.nl>
committed
on 28 Sep 18
Merge branch 'Release18_1_Development' into Release18_1
# Conflicts:
# Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs
# R… Show more
Merge branch 'Release18_1_Development' into Release18_1

# Conflicts:

#       Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs

#       Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs

#       Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs

#       Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs

Show less

1912 + 60 more