Shannon
1851303343
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/macro.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
src/umbraco.MacroEngines/RazorDynamicNode/ExtensionMethodFinder.cs
src/umbraco.MacroEngines/Resources/Web.config
src/umbraco.MacroEngines/packages.config
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
src/umbraco.cms/businesslogic/Dictionary.cs
src/umbraco.editorControls/packages.config
src/umbraco.editorControls/umbraco.editorControls.csproj
2015-02-22 16:56:02 +01:00
..
2014-01-24 18:23:37 +11:00
2015-02-22 16:56:02 +01:00
2015-02-19 09:23:07 +01:00
2014-12-02 11:44:15 +01:00
2014-05-16 12:27:54 +02:00
2014-01-24 18:23:37 +11:00
2014-10-19 13:00:54 +02:00
2013-06-23 15:13:27 +02:00
2015-01-19 13:11:51 +11:00