crobibero 524243a934 fix merge conflict

2020-06-14 20:18:06 -06:00

..

ActivityLogController.cs

Fix merge and build

2020-06-13 13:11:41 -06:00

ApiKeyController.cs

Move ApiKeyService to Jellyfin.Api

2020-06-10 15:57:31 +02:00

ConfigurationController.cs

Use Http status code 204 instead of 200

2020-06-12 12:38:13 +02:00

DevicesController.cs

Use Http status code 204 instead of 200

2020-06-12 12:38:13 +02:00

NotificationsController.cs

fix merge conflict

2020-06-14 20:18:06 -06:00

PackageController.cs

Use Http status code 204 instead of 200

2020-06-12 12:38:13 +02:00

SearchController.cs

Add response code documentation

2020-06-09 11:00:37 +02:00

StartupController.cs

Merge remote-tracking branch 'upstream/master' into HEAD

2020-06-14 20:15:26 -06:00

SubtitleController.cs

Disable CA1801

2020-06-11 16:01:41 +02:00

VideoAttachmentsController.cs

Remove unused using

2020-05-19 13:02:35 -06:00