Merge pull request #2352 from MediaBrowser/master

merge from master
2016-12-18 00:47:58 -05:00 · 2016-12-18 00:47:58 -05:00 · e78bbbd6f1
commit e78bbbd6f1
parent 38b26acd87 d7ad1331f1
3 changed files with 4 additions and 4 deletions
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@ -1244,4 +1244,4 @@ namespace MediaBrowser.Model.Dlna
            return true;
        }
    }
-}
+}
--- a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
@ -133,4 +133,4 @@ namespace MediaBrowser.XbmcMetadata.Savers
        {
        }
    }
-}
+}
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -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")]