7bec943043
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
|
||
|---|---|---|
| .. | ||
| 333fred | ||
| antonlindstrom | ||
| ave-63 | ||
| blucky | ||
| bmoorey | ||
| boo | ||
| compilation-error | ||
| csc027 | ||
| davidrambo | ||
| dcompact | ||
| ddone | ||
| default | ||
| drashna | ||
| dvorak | ||
| edvorakjp | ||
| eosti | ||
| fluffactually | ||
| fsck | ||
| gary | ||
| gsigler | ||
| hbbisenieks | ||
| impstyle | ||
| isolike | ||
| jasondunsmore | ||
| jasonkrasavage | ||
| jerryhcooke | ||
| jhelvy | ||
| khitsule | ||
| khord | ||
| krusli | ||
| manna-harbour_miryoku | ||
| mattly | ||
| mnil | ||
| mojitas | ||
| moonfall | ||
| nstickney | ||
| olligranlund_nordic | ||
| olligranlund_nordic_v2 | ||
| omgvee | ||
| osiris | ||
| pvinis | ||
| rs | ||
| sethBarberee | ||
| via | ||
| vyolle | ||
| wanleg | ||
| xyverz | ||
| yoonbae81 | ||