diff options
| author | David <daullmer@gmail.com> | 2020-06-19 12:32:38 +0200 |
|---|---|---|
| committer | David <daullmer@gmail.com> | 2020-06-19 12:32:38 +0200 |
| commit | 42385a14f055cdb648c8a96674c34877c076f4f1 (patch) | |
| tree | ffd7d87ecf1d0ed676f2e25c99f87ec70bd90a03 /Jellyfin.Api/Controllers/ActivityLogController.cs | |
| parent | 8a8bf4b6866e804c60baace62dbda9b690c5ece7 (diff) | |
| parent | 522e44de59a8661a859f6a373e495a9e0e8d13ff (diff) | |
Merge remote-tracking branch 'remotes/upstream/api-migration' into api-sessionservice
# Conflicts:
# MediaBrowser.Api/Sessions/SessionService.cs
Diffstat (limited to 'Jellyfin.Api/Controllers/ActivityLogController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/ActivityLogController.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Jellyfin.Api/Controllers/ActivityLogController.cs b/Jellyfin.Api/Controllers/ActivityLogController.cs index 895d9f719..4ae7cf506 100644 --- a/Jellyfin.Api/Controllers/ActivityLogController.cs +++ b/Jellyfin.Api/Controllers/ActivityLogController.cs @@ -1,4 +1,3 @@ -#nullable enable #pragma warning disable CA1801 using System; |