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-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-02-23 10:53:51 +01:00
2020-05-12 22:10:35 -04:00
2019-01-13 21:01:16 +01:00
2020-05-12 22:10:35 -04:00
2019-02-27 14:23:39 +01:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-04-01 13:26:47 +02:00
2019-01-13 21:37:13 +01:00
2020-05-12 22:22:20 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2020-02-12 14:08:06 +01:00
2019-03-14 22:17:56 +01:00
2020-05-12 22:10:35 -04:00
2019-07-06 16:15:38 +02:00
2019-02-20 11:09:06 +01:00
2020-05-12 22:10:35 -04:00
2020-05-12 22:10:35 -04:00
2019-10-29 17:55:16 +01:00
2019-01-17 20:24:39 +01:00
2019-01-13 21:01:16 +01:00
2019-06-10 00:53:16 +02:00
2020-04-26 14:58:43 -04:00
2020-04-26 15:51:41 -04:00
2020-04-21 16:21:09 -04:00