Merge branch 'master' into beta

This commit is contained in:
Luke Pulverenti 2016-05-21 00:49:04 -04:00
commit 7596365af2

View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5983")]
[assembly: AssemblyVersion("3.0.5960")]