Merge branch 'v7/dev' into v8/dev
# Conflicts: # apidocs/umbracotemplate/styles/main.css # build/NuSpecs/UmbracoCms.Core.nuspec # src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs # src/Umbraco.Core/Serialization/JsonNetSerializer.cs # src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs # src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js # src/Umbraco.Web.UI/umbraco/config/lang/sv.xml # src/Umbraco.Web/Cache/DistributedCacheExtensions.cs # src/Umbraco.Web/Cache/MediaCacheRefresher.cs # src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs # src/Umbraco.Web/Editors/BackOfficeController.cs # src/Umbraco.Web/Editors/ContentController.cs # src/Umbraco.Web/Profiling/WebProfiler.cs # src/Umbraco.Web/Profiling/WebProfilerProvider.cs # src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs # src/Umbraco.Web/PublishedContentExtensions.cs # src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs # src/Umbraco.Web/Search/ExamineEvents.cs # src/Umbraco.Web/umbraco.presentation/content.cs # src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
This commit is contained in:
Sebastiaan Janssen