Shannon
|
9019c49ee8
|
Merge branch '7.1.9' into 7.2.0
Conflicts:
build/NuSpecs/UmbracoCms.Core.nuspec
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
src/Umbraco.Tests/Plugins/PluginManagerTests.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Scheduling/KeepAlive.cs
src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
src/UmbracoExamine/BaseUmbracoIndexer.cs
src/UmbracoExamine/DataServices/UmbracoContentService.cs
src/UmbracoExamine/DataServices/UmbracoMediaService.cs
src/UmbracoExamine/UmbracoContentIndexer.cs
src/UmbracoExamine/UmbracoMemberIndexer.cs
|
2014-11-13 16:32:50 +11:00 |
|