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
..
integrationtests	Upgrade websocket-client to 1.2.1 (#2879)	2021-10-28 14:42:23 +09:30
unittests	Merge branch 'feature/mark-2' into feature/mark-2-boot	2021-12-30 12:06:14 -06:00
wake_word	Update to pyee 8.1.0	2020-10-22 11:43:06 +02:00
Dockerfile	Disable auto updates of skills during VK test run	2021-08-06 10:06:05 +02:00
__init__.py	__init__.py must be present	2017-08-17 02:05:02 -05:00
util.py	Base Mock config on the defualt config	2020-12-01 23:56:15 +11:00