Files
morpheus65535 dc86c0076d Merge branch 'development' into autonomous
# Conflicts:
#	bazarr/api.py
#	bazarr/config.py
#	bazarr/get_movies.py
#	bazarr/get_providers.py
#	bazarr/get_subtitle.py
#	bazarr/init.py
#	bazarr/list_subtitles.py
#	bazarr/server.py
#	bazarr/signalr_client.py
#	bazarr/utils.py
#	frontend/src/@types/system.d.ts
#	libs/version.txt
#	tests/conftest.py
#	tests/test_assrt.py
2021-12-04 09:08:13 -05:00
..
2021-09-01 00:37:30 +08:00