qmk_firmware

Author	SHA1	Message	Date
fauxpark	1895151a9c	Merge remote-tracking branch 'upstream/master' into develop	2021-09-12 14:10:26 +10:00
Ryan	4791cfae1a	Remove width, height and key_count from info.json (#14274 )	2021-09-12 14:04:56 +10:00
Zach White	d971020cd8	Fix number of elements in info.json does not match errors (#14213 ) * evyd13/atom47/rev3: best guess at fixing info.json * evyd13/atom47: best guess at fixing info.json * eyeohdesigns/sprh: best guess at fixing info.json * handwired/unicomp_mini_m: best guess at fixing info.json * lazydesigners/the60/rev2: best guess at fixing info.json * melgeek/mj6xy: best guess at fixing info.json * pizzakeyboards/pizza65: best guess at fixing info.json * plx: best guess at fixing info.json * rojectcain/vault45: best guess at fixing info.json * sidderskb/majbritt/rev2: best guess at fixing info.json * spacey: best guess at fixing info.json	2021-09-09 21:33:23 -07:00
bomb	68b1ef2d1d	[Keyboard] correct the info.json for qmk configurator and add two empty layers for via (#13552 )	2021-07-15 09:54:58 -07:00
bomb	9c4916e2e8	[Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… (#13494 ) Co-authored-by: Ryan <fauxpark@gmail.com>	2021-07-14 08:39:54 -07:00