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
..
2019-01-17 20:24:39 +01:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2020-05-12 22:10:35 -04:00
2020-04-01 19:05:41 +02:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2020-05-12 22:10:35 -04:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2019-01-28 22:06:34 +01:00
2019-01-13 21:01:16 +01:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:22:20 -04:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2019-01-13 21:01:16 +01:00
2020-03-24 16:12:06 +01:00
2020-05-12 22:10:35 -04:00
2019-01-13 21:01:16 +01:00
2020-03-03 23:07:10 +01:00
2019-01-13 21:01:16 +01:00
2019-02-15 19:33:10 +01:00
2019-01-13 21:01:16 +01:00