Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
Conflicts: build/InstallGit.cmd build/UmbracoVersion.txt src/SolutionInfo.cs src/Umbraco.Core/Configuration/UmbracoVersion.cs src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs src/Umbraco.Web/WebServices/SaveFileController.cs
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
using System.Resources;
|
||||
|
||||
[assembly: AssemblyCompany("Umbraco")]
|
||||
[assembly: AssemblyCopyright("Copyright © Umbraco 2015")]
|
||||
[assembly: AssemblyCopyright("Copyright © Umbraco 2016")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user