github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages 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
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")]