Merge branch 'v8/8.11' into v8/8.12 and bump version to 8.12.1

# Conflicts:
#	src/SolutionInfo.cs
This commit is contained in:
Sebastiaan Janssen
2021-03-11 14:55:13 +01:00
2 changed files with 4 additions and 4 deletions

View File

@@ -18,5 +18,5 @@ using System.Resources;
[assembly: AssemblyVersion("8.0.0")]
// these are FYI and changed automatically
[assembly: AssemblyFileVersion("8.12.0")]
[assembly: AssemblyInformationalVersion("8.12.0")]
[assembly: AssemblyFileVersion("8.12.1")]
[assembly: AssemblyInformationalVersion("8.12.1")]