drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source 
Resolved Conflicts:
	keyboards/checkerboards/nop60/info.json
This commit is contained in:
Zach White 2021-07-14 10:30:28 -07:00
commit 44d322623e
168 changed files with 10369 additions and 1476 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/python/qmk/cli/__init__.py
View file

@ -16,6 +16,7 @@ import_names = {
# A mapping of package name to importable name
'pep8-naming': 'pep8ext_naming',
'pyusb': 'usb.core',
'qmk-dotty-dict': 'dotty_dict'
}
safe_commands = [