e25f6e82ed
# Conflicts: # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/UmbracoVersion.cs # src/Umbraco.Web/Models/Mapping/UserModelMapper.cs