mirror of
https://github.com/maxdorninger/MediaManager.git
synced 2026-04-27 03:05:35 +02:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # media_manager/metadataProvider/tvdb.py
This commit is contained in:
# Conflicts: # media_manager/metadataProvider/tvdb.py