b0060a9592
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
15 lines
422 B
C#
15 lines
422 B
C#
using System.Reflection;
|
|
using System.Resources;
|
|
|
|
[assembly: AssemblyCompany("Umbraco")]
|
|
[assembly: AssemblyCopyright("Copyright © Umbraco 2016")]
|
|
[assembly: AssemblyTrademark("")]
|
|
[assembly: AssemblyCulture("")]
|
|
|
|
[assembly: NeutralResourcesLanguageAttribute("en-US")]
|
|
|
|
|
|
[assembly: AssemblyVersion("1.0.*")]
|
|
|
|
[assembly: AssemblyFileVersion("7.4.0")]
|
|
[assembly: AssemblyInformationalVersion("7.4.0-beta")] |