diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-26 20:29:11 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-26 20:29:11 -0400 |
| commit | 01ce56016a3e7189cf29b22b095dc15b82a19303 (patch) | |
| tree | d627726db3424ac1ae3c47fde44644462a3e5a27 /MediaBrowser.Model/Net | |
| parent | e052128c527672ed586a78257da1d2b07319e598 (diff) | |
| parent | 7c72f69189500ef491a0e81d8ce6788987f47fa3 (diff) | |
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
# MediaBrowser.Api/UserService.cs
# MediaBrowser.Controller/Library/IUserManager.cs
Diffstat (limited to 'MediaBrowser.Model/Net')
| -rw-r--r-- | MediaBrowser.Model/Net/MimeTypes.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs index fe2fbe7e4..b6d7b4245 100644 --- a/MediaBrowser.Model/Net/MimeTypes.cs +++ b/MediaBrowser.Model/Net/MimeTypes.cs @@ -67,6 +67,7 @@ namespace MediaBrowser.Model.Net { ".m3u8", "application/x-mpegURL" }, { ".map", "application/x-javascript" }, { ".mobi", "application/x-mobipocket-ebook" }, + { ".opf", "application/oebps-package+xml" }, { ".pdf", "application/pdf" }, { ".rar", "application/vnd.rar" }, { ".srt", "application/x-subrip" }, @@ -99,6 +100,7 @@ namespace MediaBrowser.Model.Net { ".ssa", "text/x-ssa" }, { ".css", "text/css" }, { ".csv", "text/csv" }, + { ".edl", "text/plain" }, { ".rtf", "text/rtf" }, { ".txt", "text/plain" }, { ".vtt", "text/vtt" }, |