diff options
| author | Patrick Barron <barronpm@gmail.com> | 2024-01-17 12:07:30 -0500 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2024-01-17 12:08:01 -0500 |
| commit | 4399b51dca80e45d70a06d86994a7c2338ae4f1f (patch) | |
| tree | d32c0b8f90fc3bac82fa750fa8c28eaf665810ad /Jellyfin.Api/Controllers/StartupController.cs | |
| parent | 3e32f94fb3ab8f817a74e7dd27981174869a0c45 (diff) | |
| parent | e7b8d45bbb0f2b832245dae7ac0d401c56cb10a4 (diff) | |
Merge branch 'master' into livetv-guidemanager
# Conflicts:
# src/Jellyfin.LiveTv/LiveTvManager.cs
Diffstat (limited to 'Jellyfin.Api/Controllers/StartupController.cs')
0 files changed, 0 insertions, 0 deletions