Shannon
|
f9ba3fe76f
|
Merge branch 'dev-v8' into dev-v8-ExamineV2
# Conflicts:
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Plugins/PluginManager.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
# src/Umbraco.Tests/Services/MediaServiceTests.cs
# src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
# src/Umbraco.Web.UI/config/ClientDependency.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/UmbracoExamine/UmbracoContentIndexer.cs
|
2016-05-19 16:32:22 +02:00 |
|