Merge pull request #2352 from MediaBrowser/master

merge from master
This commit is contained in:
Luke
2016-12-18 00:47:58 -05:00
committed by GitHub
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -1244,4 +1244,4 @@ namespace MediaBrowser.Model.Dlna
return true;
}
}
}
}
@@ -133,4 +133,4 @@ namespace MediaBrowser.XbmcMetadata.Savers
{
}
}
}
}
+2 -2
View File
@@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("3.1.*")]
//[assembly: AssemblyVersion("3.0.6060")]
//[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.1.259")]