Merge branch 'master' into authenticationdb-efcore

# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
This commit is contained in:
Patrick Barron
2021-05-18 18:09:46 -04:00
618 changed files with 6419 additions and 3479 deletions

View File

@@ -1,3 +1,5 @@
#nullable disable
using System;
using MediaBrowser.Controller.Session;
using MediaBrowser.Model.QuickConnect;