michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1cdb420d2e
jellyfin/MediaBrowser.Server.Implementations/LiveTv/TunerHosts
History
Luke Pulverenti 1cdb420d2e Merge branch 'beta' into dev 
Conflicts:
	MediaBrowser.Api/StartupWizardService.cs
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
	MediaBrowser.Server.Implementations/Dto/DtoService.cs
	MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
	MediaBrowser.Server.Implementations/Library/LibraryManager.cs
	MediaBrowser.Server.Implementations/Localization/Core/ca.json
	MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
	MediaBrowser.Server.Implementations/packages.config
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ca.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ca.json
	SharedVersion.cs
2016-02-01 22:21:58 -05:00
..
HdHomerun increase hdhomerun bitrates 2015-12-29 11:26:42 -05:00
SatIp comment out satip discovery 2016-01-27 11:57:56 -05:00
BaseTunerHost.cs add tuner error handling 2015-12-28 13:41:53 -05:00
M3UTunerHost.cs update tuner pooling 2015-10-30 12:40:12 -04:00
SatIp.cs stub out sat/ip 2016-01-25 16:33:36 -05:00