diff options
| author | Luke Foust <luke@foust.com> | 2020-03-22 12:28:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 12:28:59 -0700 |
| commit | f3213d3bef8a49a5e91cafaba2eaefb5592438c6 (patch) | |
| tree | 70e01db58e64ebd96bc0625a1ad779a33cc23de7 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | dcd0d93f44bf1befea5e61993bc868b5846102a0 (diff) | |
| parent | 425bd2b01b7ad3397d38c29da8ac50d68bd9a1cf (diff) | |
Merge pull request #2 from jellyfin/master
merge with upstream master
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
0 files changed, 0 insertions, 0 deletions