mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-08-21 03:18:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
Userspace for the open-source QMK keyboard firmware.
1332 commits 1 branch 1 tag 12 MiB
Find a file
James Young 342a08c355 Merge remote-tracking branch 'upstream/master' into develop 
Fixes merge conflicts in:

- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
  - Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
  - Conflict from PR 13947
2021-08-11 09:48:25 -07:00
keyboards Merge remote-tracking branch 'upstream/master' into develop 2021-08-11 09:48:25 -07:00