Commit Graph

2 Commits

Author SHA1 Message Date
Patrick Barron
4399b51dca Merge branch 'master' into livetv-guidemanager
# Conflicts:
#	src/Jellyfin.LiveTv/LiveTvManager.cs
2024-01-17 12:08:01 -05:00
Patrick Barron
59c2ae944d Add IGuideManager service 2024-01-17 09:52:11 -05:00