Shannon
371b1817ea
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias
Conflicts:
src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
src/Umbraco.Core/XmlHelper.cs
src/Umbraco.Tests/ObjectExtensionsTests.cs
src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
src/Umbraco.Web/Routing/DefaultUrlProvider.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/macro.cs
2013-09-17 00:27:17 +10:00
..
2013-09-17 00:27:17 +10:00
2013-03-09 10:43:34 -01:00
2013-03-09 10:43:34 -01:00
2013-02-28 16:00:35 -01:00
2013-03-09 10:43:34 -01:00
2013-01-18 13:51:40 -01:00
2012-12-27 18:52:47 -01:00
2013-03-09 10:43:34 -01:00
2013-03-09 10:43:34 -01:00
2012-12-07 13:48:38 -01:00
2012-11-30 15:01:52 -01:00
2012-12-07 13:48:38 -01:00
2012-11-30 15:01:52 -01:00
2012-11-30 15:01:52 -01:00
2012-11-30 15:01:52 -01:00