Fixes up merging issues, bit of manual process with this one

2016-05-31 17:24:40 +02:00
parent 6a5a736877
commit c025dd463f
13 changed files with 148 additions and 100 deletions
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -15,6 +15,7 @@ using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Trees;
 using Umbraco.Web.Routing;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Web._Legacy.Actions;

 namespace Umbraco.Web.Models.Mapping
 {