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-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-04-01 19:05:41 +02:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-05-12 22:10:35 -04:00
2020-04-11 15:37:24 +02:00
2020-03-03 23:07:10 +01:00
2020-03-24 16:12:06 +01:00
2020-03-03 23:07:10 +01:00
2020-03-18 17:43:15 +09:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-05-12 16:03:15 -04:00
2019-03-14 22:17:56 +01:00
2020-03-03 23:07:10 +01:00
2020-04-04 15:12:02 -04:00
2020-05-13 18:02:54 +02:00
2020-03-18 17:43:15 +09:00
2020-03-03 23:07:10 +01:00
2020-03-03 23:07:10 +01:00
2020-04-21 16:21:09 -04:00