Merge branch 'master' into general-devel

This commit is contained in:
Lucas Nicodemus 2017-12-12 03:02:00 -07:00
commit 65fd892091
2 changed files with 3 additions and 3 deletions

View file

@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// Also, be sure to release on github with the exact assembly version tag as below
// so that the update manager works correctly (via the Github releases api and mimic)
[assembly: AssemblyVersion("4.3.24")]
[assembly: AssemblyFileVersion("4.3.24")]
[assembly: AssemblyVersion("4.3.25")]
[assembly: AssemblyFileVersion("4.3.25")]

@ -1 +1 @@
Subproject commit faa3b95697bbf675503b2823c5f59593cf825bb3
Subproject commit 2c25bb68fde0e2c40a32d639ff79d614d3fb1580