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
..
__init__.py	Remove the ConfigurationManager compatibility	2020-02-11 14:48:44 +01:00
config.py	Stop location being referenced before assignment	2021-01-19 11:44:14 +01:00
locations.py	Feature/non hard coded paths (#2058)	2019-03-21 13:19:11 -05:00
mycroft.conf	Merge remote-tracking branch 'origin/dev' into feature/mark-2	2021-03-15 18:47:32 -05:00