Chris Veilleux 8453e79900 Merge remote-tracking branch 'origin/dev' into feature/mark-2 ... # Conflicts: # mycroft/tts/tts.py		2021-03-15 18:47:32 -05:00
..
extra-audiobackend.txt	Move requirements.txt to a new requirements folder and add optional deps	2020-05-11 15:31:10 +02:00
extra-mark1.txt	Move requirements.txt to a new requirements folder and add optional deps	2020-05-11 15:31:10 +02:00
extra-mark2.txt	add sj201r4 requirements	2020-12-15 14:56:49 +09:30
extra-stt.txt	Move requirements.txt to a new requirements folder and add optional deps	2020-05-11 15:31:10 +02:00
requirements.txt	Merge branch 'dev' into upgrade/requests	2021-03-11 15:29:44 +09:30
tests.txt	Move requirements.txt to a new requirements folder and add optional deps	2020-05-11 15:31:10 +02:00