diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-12 22:22:20 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-12 22:22:20 -0400 |
| commit | c1360a1dc312938e77e52a509eb9186300bcb40d (patch) | |
| tree | 492b4d717a12b20a4649b2fbc48050430ea72d50 /MediaBrowser.Api/BaseApiService.cs | |
| parent | 9ad839c7766bd5d6121a10b2c306d6fef9666c52 (diff) | |
| parent | 32c118222647f121c0b17055c0ef158763c0b5d2 (diff) | |
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
Diffstat (limited to 'MediaBrowser.Api/BaseApiService.cs')
0 files changed, 0 insertions, 0 deletions