You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Louis Vézina 995b9ac9ae Merge branch 'development' into python3 ... # Conflicts: # bazarr/get_episodes.py # bazarr/get_movies.py # bazarr/get_subtitle.py # bazarr/list_subtitles.py # bazarr/main.py # libs/subliminal_patch/core.py # libs/subliminal_patch/providers/addic7ed.py		5 years ago
..
__init__.py	…
baseparser.py	…
ffprobeparsers.py	Merge branch 'development' into python3	5 years ago
pyprobe.py	Bug correction	5 years ago