Shannon
02a903f77b
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/UmbracoHelper.cs
src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
src/Umbraco.Web/umbraco.presentation/library.cs
src/Umbraco.Web/umbraco.presentation/macro.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
src/umbraco.MacroEngines/RazorDynamicNode/DynamicBackingItem.cs
src/umbraco.MacroEngines/app.config
src/umbraco.MacroEngines/packages.config
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
src/umbraco.cms/businesslogic/Packager/Installer.cs
src/umbraco.editorControls/app.config
src/umbraco.editorControls/packages.config
src/umbraco.editorControls/umbraco.editorControls.csproj
src/umbraco.providers/app.config
2015-01-19 13:11:51 +11:00
..
2014-01-24 18:23:37 +11:00
2015-01-07 11:28:23 +01:00
2014-11-15 14:19:51 +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
2013-02-27 13:51:58 -01:00
2013-04-25 09:02:58 -02:00
2015-01-19 13:11:51 +11:00