Patrick Barron
c1360a1dc3
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Entities/User.cs
# Jellyfin.Data/ISavingChanges.cs
# Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
# Jellyfin.Server.Implementations/JellyfinDb.cs
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Model/Notifications/NotificationOptions.cs
# MediaBrowser.sln
2020-05-12 22:22:20 -04:00
..
2020-05-02 18:32:22 -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-05-12 22:10:35 -04:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-05-01 16:48:33 +02:00
2020-02-23 12:11:43 +01:00
2020-05-07 14:52:10 +02: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-07 15:58:20 -04:00
2020-05-12 22:22:20 -04:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2019-03-14 22:17:56 +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-04-11 20:10:16 +09: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
2020-05-02 18:32:22 -04:00