aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Net
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-09-20 13:34:05 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-09-20 13:34:05 -0400
commit4492dcc5922f4ead968504617b729e102db26c54 (patch)
tree7f8afc4a40479f4b4c313ffc9d1004a426c1b004 /MediaBrowser.Model/Net
parent25c37e40ad11006af1127355bd05ae1b16a5f7b6 (diff)
update merge
Diffstat (limited to 'MediaBrowser.Model/Net')
-rw-r--r--MediaBrowser.Model/Net/MimeTypes.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 419809160..e905af58d 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -321,4 +321,4 @@ namespace MediaBrowser.Model.Net
return null;
}
}
-} \ No newline at end of file
+}