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-07-05 10:51:19 +02:00
2013-06-27 15:27:05 +10:00
2013-05-26 13:33:43 -10:00
2013-09-16 15:52:59 +10:00
2013-06-27 15:27:05 +10:00
2012-06-22 20:39:48 +04:00
2012-09-16 10:49:19 -02:00
2012-06-22 20:39:48 +04:00
2013-08-22 14:46:43 +02:00
2013-06-26 11:12:06 +02:00
2012-12-31 18:39:36 +03:00
2012-06-22 20:39:48 +04:00
2012-06-22 20:39:48 +04:00
2013-06-27 15:27:05 +10:00
2013-07-22 11:29:32 +10:00
2013-09-10 23:33:26 +02:00
2013-09-12 14:38:53 +02:00
2013-02-23 23:00:31 +06:00
2013-06-26 11:12:06 +02:00
2013-06-27 15:27:05 +10:00
2013-07-04 13:33:06 +02:00
2012-06-22 20:39:48 +04:00
2013-07-24 13:10:43 +10:00
2013-07-03 13:55:33 +02:00
2012-06-22 20:39:48 +04:00
2013-07-23 13:41:42 +10:00
2013-02-01 06:05:39 +06:00