Sebastiaan Janssen
|
dcf2e4830f
|
Merge branch 'dev-v7' into temp8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/IO/MediaFileSystem.cs
# src/Umbraco.Core/Media/Exif/ImageFile.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs
|
2019-01-11 10:23:27 +01:00 |
|