Louis Vézina 49d81aab35 Merge branch 'development' into hermes ... # Conflicts: # bazarr/main.py # views/providers.tpl # views/settings_general.tpl		2020-03-08 10:23:39 -04:00
..
osdefs.h	Move scandir.c header files to the correct directory	2020-03-03 14:06:25 +01:00
winreparse.h	Move scandir.c header files to the correct directory	2020-03-03 14:06:25 +01:00