alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-18 18:42:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2352 from MediaBrowser/master

Browse Source 
merge from master
This commit is contained in:
Luke
2016-12-18 00:47:58 -05:00
committed by GitHub
parent 38b26acd87 d7ad1331f1
commit e78bbbd6f1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@@ -1244,4 +1244,4 @@ namespace MediaBrowser.Model.Dlna
return true;
}
}
}
}

2
MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs
View File

@@ -133,4 +133,4 @@ namespace MediaBrowser.XbmcMetadata.Savers
{
}
}
}
}

4
SharedVersion.cs
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")]