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
..
services	Lock around tracklist access	2021-01-22 14:40:00 +01:00
__init__.py	Clean up mycroft/audio/__init__.py	2020-01-15 09:06:50 +01:00
__main__.py	add ProcessStatus to key services	2021-01-28 17:24:21 +01:00
audioservice.py	Merge remote-tracking branch 'origin/dev' into feature/mark-2	2021-02-26 11:49:30 -06:00
speech.py	Add the stack trace to an error message to help with debugging.	2021-03-10 13:39:58 -06:00
utils.py	Only stop speaking if speaking is active	2021-02-01 20:26:44 +01:00