diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-27 01:31:31 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-27 01:33:59 -0500 |
| commit | 106a2f3e1a0bfee9e056ef22b94599c7b2a47530 (patch) | |
| tree | f766b9a6f0a161cd21c432ba53bc3f2a3deb3b22 /MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs | |
| parent | 51cd5e90b0a926ea728f9b98e5b9f380948b5cce (diff) | |
add back MergeMetadataAndImagesByName
Conflicts:
MediaBrowser.Model/Configuration/ServerConfiguration.cs
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs')
0 files changed, 0 insertions, 0 deletions