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-15 17:20:07 -04:00
2020-04-14 15:11:21 -04:00
2020-04-14 15:16:04 -04:00
2020-04-19 13:39:12 -04:00
2020-05-10 18:07:56 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-14 17:13:45 -04:00
2020-04-14 16:13:41 -04:00
2020-05-13 00:00:57 -04:00
2020-05-15 17:20:07 -04:00
2020-05-12 22:10:35 -04:00
2020-05-15 17:20:07 -04:00
2020-04-04 21:18:09 -04:00
2020-05-15 17:20:07 -04:00
2020-02-23 12:11:43 +01:00
2020-04-04 17:33:00 -04:00
2020-05-15 17:20:07 -04:00
2020-05-15 17:20:07 -04:00
2020-05-14 23:26:47 -04:00
2020-04-01 19:05:41 +02:00
2020-05-02 01:09:35 +02:00
2020-03-24 16:12:06 +01:00
2020-05-12 22:10:35 -04:00
2019-03-14 22:17:56 +01:00
2020-04-11 10:00:39 -04:00
2020-04-04 19:36:27 -04:00
2020-01-22 22:20:35 +01:00
2020-04-20 10:18:12 +02:00
2020-05-15 17:20:07 -04:00
2020-05-14 11:08:08 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-01-13 09:00:30 +01:00
2020-04-11 20:10:16 +09:00
2019-10-20 16:08:40 +02:00
2020-05-15 17:20:07 -04:00
2020-04-21 12:11:55 +02:00
2020-05-14 17:13:45 -04:00
2020-04-05 13:46:36 -04:00
2019-06-10 00:53:16 +02:00
2020-04-26 15:51:41 -04:00