Joshua Diamond a4d1d8b745 Resolve conflict merging master to develop (#18297) ... * Discourage use of ENCODER_MAP at keyboard level (#18286) * Discourage use of ENCODER_MAP at keyboard level * Update docs/feature_encoders.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> * Fungo rev1: fix QMK Configurator key sequence (#18293) * info.json: correct JSON syntax; friendly formatting * info.json: fix key sequence Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>		2022-09-06 17:42:43 -04:00
..
config.h	Remove legacy USE_SERIAL define (#18292)	2022-09-06 18:46:34 +01:00
info.json	Resolve conflict merging master to develop (#18297)	2022-09-06 17:42:43 -04:00
post_config.h	Format code according to conventions (#18119)	2022-08-20 21:07:57 +01:00
rev1.c	add fungo keyboard (#17513)	2022-08-20 21:01:04 +01:00
rev1.h	add fungo keyboard (#17513)	2022-08-20 21:01:04 +01:00
rules.mk	add fungo keyboard (#17513)	2022-08-20 21:01:04 +01:00