You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		9 years ago
..
ChannelConfigurations.cs	fixes #859 - Support adaptive bitrate streaming	11 years ago
ChannelDynamicMediaSourceProvider.cs	update stream generation	10 years ago
ChannelImageProvider.cs	live tv fix	10 years ago
ChannelManager.cs	Merge branch 'beta' into dev	9 years ago
ChannelPostScanTask.cs	encode with qsv	9 years ago
RefreshChannelsScheduledTask.cs	keep channels db clean	10 years ago