aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Serialization/IJsonSerializer.cs
diff options
context:
space:
mode:
authorPhallacy <Dragoonmac@gmail.com>2019-02-20 00:46:13 -0800
committerPhallacy <Dragoonmac@gmail.com>2019-02-20 00:46:13 -0800
commita0d31a49a0047a39cb2c4f7d67be64153b0a3266 (patch)
tree8c0b3a7fb0b68bf778b92872a32949a88b891d80 /MediaBrowser.Model/Serialization/IJsonSerializer.cs
parent6bbb968b578fe42224227b70e78825bbed5cfc6f (diff)
parent6c6e9ca9f22d4c4bd1175d4abae846d09d2f074d (diff)
merging with master to clear merge conflict
Diffstat (limited to 'MediaBrowser.Model/Serialization/IJsonSerializer.cs')
-rw-r--r--MediaBrowser.Model/Serialization/IJsonSerializer.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Serialization/IJsonSerializer.cs b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
index ae0cf6f36..18f51f652 100644
--- a/MediaBrowser.Model/Serialization/IJsonSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
@@ -15,6 +15,14 @@ namespace MediaBrowser.Model.Serialization
void SerializeToStream(object obj, Stream stream);
/// <summary>
+ /// Serializes to stream.
+ /// </summary>
+ /// <param name="obj">The obj.</param>
+ /// <param name="stream">The stream.</param>
+ /// <exception cref="ArgumentNullException">obj</exception>
+ void SerializeToStream<T>(T obj, Stream stream);
+
+ /// <summary>
/// Serializes to file.
/// </summary>
/// <param name="obj">The obj.</param>