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

..

333fred

…

antonlindstrom

keymap_extras: Remove deprecated defines (#12949)

2021-07-06 09:05:11 +10:00

ave-63

…

blucky

Audio system overhaul (#11820)

2021-02-15 09:40:38 +11:00

bmoorey

…

boo

[Keymap] Add iris keymap 'boo' (#12749)

2021-05-13 10:51:57 -07:00

compilation-error

[Keymap] Keebio Iris rev4 - keymap with dual encoder support (#13063)

2021-06-15 21:54:36 -07:00

csc027

[Keymap] csc027/keymap-updates (#12694)

2021-05-13 20:54:41 -07:00

davidrambo

[Keymap] Update personal keymaps, add Corne keymap, and update non-kc LAYOUT for Iris (#12273)

2021-07-02 22:30:32 -07:00

dcompact

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

ddone

Remove Full Bootmagic (#13846)

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

default

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

drashna

Remove Full Bootmagic (#13846)

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

dvorak

…

edvorakjp

Remove Full Bootmagic (#13846)

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

eosti

…

fluffactually

…

fsck

…

gary

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

gsigler

…

hbbisenieks

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

impstyle

…

isolike

…

jasondunsmore

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

jasonkrasavage

…

jerryhcooke

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

jhelvy

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

khitsule

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

khord

…

krusli

…

manna-harbour_miryoku

[Keymap] Update Miryoku (#13307)

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

mattly

…

mnil

[Keymap] Add my keymaps for the Keebio Iris and Planck (#13005)

2021-06-18 17:55:56 -07:00

mojitas

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

moonfall

…

nstickney

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

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

olligranlund_nordic

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

2021-07-16 16:40:05 +00:00

olligranlund_nordic_v2

[Keyboard] Neito + my DZ60 keymap tweaks (#11773)

2021-07-16 09:39:35 -07:00

omgvee

…

osiris

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

pvinis

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

rs

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

sethBarberee

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

via

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

vyolle

Remove Full Bootmagic (#13846)

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

wanleg

…

xyverz

2021 May 29 Breaking Changes Update (#13034)

2021-05-29 14:38:50 -07:00

yoonbae81

…