Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs		2020-05-15 17:20:07 -04:00
..
Device.cs	Update Device.cs	2020-04-04 00:24:36 +02:00
DeviceInfo.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
PlaybackProgressEventArgs.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
PlaybackStartEventArgs.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
PlaybackStoppedEventArgs.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
PlaylistItem.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
PlaylistItemFactory.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
PlayToController.cs	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
PlayToManager.cs	Fix some warnings	2020-04-02 16:52:11 +02:00
SsdpHttpClient.cs	Fix some warnings	2020-04-02 16:52:11 +02:00
TransportCommands.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
TRANSPORTSTATE.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
uBaseObject.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
UpnpContainer.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
uPnpNamespaces.cs	Fix some warnings	2020-02-23 12:11:43 +01:00