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-12 22:10:35 -04:00
2020-03-24 16:12:06 +01:00
2020-05-14 16:15:09 -07:00
2020-04-27 19:03:42 +03:00
2020-02-23 12:11:43 +01:00
2020-05-14 16:15:09 -07:00
2019-12-10 16:22:03 +01:00
2020-05-02 01:30:04 +02:00