yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v8/8.6' up into v8/dev

Browse Source 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
This commit is contained in:
Warren Buckley
2020-02-24 15:11:58 +00:00
parent 4ca4d8e6e0 b41c3ad3bc
commit 4ed69d21a0
18 changed files with 394 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SolutionInfo.cs
View File

@@ -2,7 +2,7 @@
using System.Resources;
[assembly: AssemblyCompany("Umbraco")]
[assembly: AssemblyCopyright("Copyright © Umbraco 2019")]
[assembly: AssemblyCopyright("Copyright © Umbraco 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]