Riskeer

Clone
Elmar Kleijn
committed
3179194
on 23 Mar 18
Merge branch 'master' into 1612
# Conflicts:
# Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
# Ringtoets/Common/… Show more
Merge branch 'master' into 1612

# Conflicts:

#       Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj

#       Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/Ringtoets.Common.Forms.TestUtil.Test.csproj

Show less

1691 + 70 more