mirror of
https://github.com/morpheus65535/bazarr.git
synced 2025-02-23 22:35:33 +08:00
Merge branch 'development' into python3
# Conflicts: # bazarr/main.py
This commit is contained in:
commit
8ed8ecd39b
# Conflicts: # bazarr/main.py