Files
jellyfin/MediaBrowser.Model
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
..
2020-05-14 17:13:45 -04:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-05-14 17:13:45 -04:00
2020-05-01 16:48:33 +02:00
2020-02-23 12:11:43 +01:00
2020-04-20 10:18:12 +02:00
2020-02-04 01:49:27 +01:00
2020-05-01 16:48:33 +02:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-04-11 12:03:10 +02:00
2020-02-23 12:11:43 +01:00
2020-05-14 11:08:08 -04:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-04-11 20:10:16 +09:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-04-20 14:27:46 +09:00
2020-05-12 22:10:35 -04:00