James Young 7bec943043

Merge remote-tracking branch 'upstream/master' into develop ...

Fixes merge conflicts in:

- keyboards/bm40hsrgb/config.h
  - Conflict from PR 13132:
    - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
    - updated file with changes from master branch

- keyboards/keebio/iris/keymaps/nstickney/keymap.c
  - Conflict from PR 11456:
    - layer_state_set_user() updated in develop branch, removed in master branch
    - updated file with changes from master branch

2021-08-09 12:14:22 -07:00

..

config.h

[User] changes to nstickney's keymaps (#11456)

2021-08-09 10:34:36 -07:00

keymap.c

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

2021-08-09 12:14:22 -07:00