jellyfin/MediaBrowser.Model/Notifications
Patrick Barron c1360a1dc3 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
2020-05-12 22:22:20 -04:00
..
NotificationLevel.cs Fix some warnings 2020-02-23 12:11:43 +01:00
NotificationOption.cs Fix some warnings 2020-02-23 12:11:43 +01:00
NotificationOptions.cs Merge branch 'master' into userdb-efcore 2020-05-12 22:22:20 -04:00
NotificationRequest.cs Fix some warnings 2020-02-23 12:11:43 +01:00
NotificationType.cs Fix some warnings 2020-02-23 12:11:43 +01:00
NotificationTypeInfo.cs Fix some warnings 2020-02-23 12:11:43 +01:00
SendToUserType.cs Fix some warnings 2020-02-23 12:11:43 +01:00