Merge pull request #1993 from MediaBrowser/master

merge from master
This commit is contained in:
Luke
2016-07-27 15:32:47 -04:00
committed by GitHub
2 changed files with 142 additions and 2446 deletions

File diff suppressed because it is too large Load Diff

View File

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