Merge branch 'master' into beta

This commit is contained in:
Luke Pulverenti 2016-07-22 01:50:18 -04:00
commit d41ae85ed2

View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")] //[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.1.72")] [assembly: AssemblyVersion("3.0.5986")]