Shannon
3df2d03fc8
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
Conflicts:
build/Build.bat
build/NuSpecs/UmbracoCms.Core.nuspec
build/NuSpecs/build/UmbracoCms.targets
src/Umbraco.Core/Models/IPublishedContentProperty.cs
src/Umbraco.Core/Models/PublishedContent/IPublishedContentExtended.cs
src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs
src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
src/Umbraco.Core/Models/Template.cs
src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
src/Umbraco.Core/Services/PackagingService.cs
src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedFragment.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
src/Umbraco.Web/PublishedContentPropertyExtension.cs
src/Umbraco.Web/Search/ExamineEvents.cs
src/Umbraco.Web/UmbracoHelper.cs
src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
src/Umbraco.Web/umbraco.presentation/macro.cs
src/umbraco.cms/businesslogic/template/Template.cs
2014-05-05 12:49:06 +10:00
..
2014-05-05 12:49:06 +10:00
2013-02-28 05:05:06 +06:00
2013-02-28 05:05:06 +06:00
2013-03-01 03:04:29 +06:00