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

..

60_ansi

[Keymap] Update Miryoku (#13307)

2021-07-03 09:09:02 -07:00

60_ansi_arrow_split_bs_7u_spc/mrsendyyk

…

60_ansi_split_bs_rshift

[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)

2021-08-03 09:39:43 -07:00

60_hhkb

…

60_iso

…

60_tsangan_hhkb

[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)

2021-08-03 09:39:43 -07:00

65_ansi

…

65_ansi_blocker

[Keymap] Add stanrc85 community layout (#13338)

2021-07-03 01:06:21 -07:00

65_ansi_blocker_split_bs

[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)

2021-08-03 09:39:43 -07:00

66_ansi

…

68_ansi

…

75_ansi

…

alice/stanrc85-alice

…

ergodox

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

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

numpad_5x4/mrsendyyk

…

numpad_5x6

Remove Full Bootmagic (#13846)

2021-08-06 23:59:56 -07:00

ortho_1x1

…

ortho_1x4

Six Pack and ortho_ layout updates (#13587)

2021-07-19 17:30:09 -07:00

ortho_2x3

Six Pack and ortho_ layout updates (#13587)

2021-07-19 17:30:09 -07:00

ortho_2x6

Six Pack and ortho_ layout updates (#13587)

2021-07-19 17:30:09 -07:00

ortho_3x10

…

ortho_4x4

…

ortho_4x10/manna-harbour_miryoku

[Keymap] Update Miryoku (#13307)

2021-07-03 09:09:02 -07:00

ortho_4x12

Remove Full Bootmagic (#13846)

2021-08-06 23:59:56 -07:00

ortho_5x5

Six Pack and ortho_ layout updates (#13587)

2021-07-19 17:30:09 -07:00

ortho_5x10

…

ortho_5x12

Remove Full Bootmagic (#13846)

2021-08-06 23:59:56 -07:00

ortho_5x14

…

ortho_5x15

[Keymap] Update Miryoku (#13307)

2021-07-03 09:09:02 -07:00

planck_mit

[Keymap] Update Miryoku (#13307)

2021-07-03 09:09:02 -07:00

split_3x5_3/manna-harbour_miryoku

[Keymap] Update Miryoku (#13307)

2021-07-03 09:09:02 -07:00

split_3x6_3

[Keymap] Drashna split transport improvement (#13905)

2021-08-07 21:40:48 -07:00

tkl_ansi

…