Merge branch 'leekelleher-U4-337' into 7.3.0

Conflicts: src/Umbraco.Core/Umbraco.Core.csproj
2015-01-06 12:24:29 +11:00
parent 46e939715a 8509aef99a
commit fa48af02a1
18 changed files with 427 additions and 3 deletions
--- a/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
+++ b/src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Models.Rdbms
    internal class RelationTypeDto
    {
        [Column("id")]
-        [PrimaryKeyColumn(IdentitySeed = 2)]
+        [PrimaryKeyColumn(IdentitySeed = 3)]
        public int Id { get; set; }

        [Column("dual")]