diff options
| author | Max Git <rotvel@gmail.com> | 2020-06-23 10:24:34 +0200 |
|---|---|---|
| committer | Max Git <rotvel@gmail.com> | 2020-06-23 10:24:34 +0200 |
| commit | 1c84a31b22fa8708ad3c0c901abda4aac903f28d (patch) | |
| tree | 7aaea127bd78ead70d238e2743bf6197755c7f92 /Jellyfin.Server/Program.cs | |
| parent | c35c401d65e00fd539c5451fbb0391327af5c610 (diff) | |
| parent | 4e088760284947c92147bcc794e942da520de0c2 (diff) | |
Merge branch 'master' into feature/ffmpeg-version-check
Diffstat (limited to 'Jellyfin.Server/Program.cs')
0 files changed, 0 insertions, 0 deletions