Chris Veilleux abab1e9bda Merge branch 'feature/mark-2' into feature/mark-2-boot ... # Conflicts: # mycroft/client/enclosure/mark2/interface.py		2021-12-30 12:06:14 -06: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 'feature/mark-2' into feature/mark-2-boot	2021-12-30 12:06:14 -06:00
tests.txt	remove use_2to3 from dependencies	2021-10-04 16:20:35 +09:30