crobibero 88b6c26472 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-channel ...

# Conflicts:
#	Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs

2020-06-03 09:38:49 -06:00

..

ChannelsController.cs

Fix optional parameter binding

2020-05-24 16:01:53 -06:00

ConfigurationController.cs

revert to System.Text.JsonSerializer

2020-06-02 08:23:12 -06:00

NotificationsController.cs

Fix xml docs

2020-05-03 14:02:15 -06:00

StartupController.cs

apply doc suggestions

2020-05-17 19:56:02 -06:00