diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-12-18 00:47:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 00:47:30 -0500 |
| commit | de06847f41d6a5cf56397d661a33cbfa646a2372 (patch) | |
| tree | cdc6ea0ffdd5e8066dc81bbc39480436d58dacd7 | |
| parent | aaa027f3229073e9a40756c3157d41af2a442922 (diff) | |
| parent | d7ad1331f17a0985cf0a83d1a155caef68a733d0 (diff) | |
Merge pull request #2351 from MediaBrowser/master
merge from master
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index aac4ed4d1..6d68831ff 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -1244,4 +1244,4 @@ namespace MediaBrowser.Model.Dlna return true; } } -} +}
\ No newline at end of file diff --git a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs index 158e87899..3346b43d3 100644 --- a/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/EpisodeNfoSaver.cs @@ -133,4 +133,4 @@ namespace MediaBrowser.XbmcMetadata.Savers { } } -} +}
\ No newline at end of file |