Merge branch origin/dev-v7 into dev-v7-deploy

This commit is contained in:
Stephan
2016-08-26 13:20:53 +02:00
22 changed files with 61 additions and 286 deletions

View File

@@ -12,4 +12,4 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.6.0")]
[assembly: AssemblyInformationalVersion("7.6.0-alpha003")]
[assembly: AssemblyInformationalVersion("7.6.0-alpha004")]