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
..
__init__.py	Restore system locations to mycroft.configuration	2021-08-05 10:04:45 +02:00
config.py	Merge pull request #3045 from forslund/bugfix/config-creation-at-import	2021-12-01 09:17:41 +09:30
locale.py	Upgrade Lingua Franca to v0.4.1 (#2890)	2021-05-08 08:34:02 +09:30
locations.py	Do not create configs folders until writing	2021-11-30 22:50:09 +01:00
mycroft.conf	Merge branch 'feature/mark-2' into feature/mark-2-boot	2021-12-30 12:06:14 -06:00