James Young 4279b14adf Merge remote-tracking branch 'upstream/master' into develop ... Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk		2021-08-19 11:32:23 -07:00
..
60_ansi
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	[Keymap] Add personal layout for 60% ISO boards (#13232)	2021-08-19 09:41:14 -07:00
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
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 'origin/master' into develop	2021-08-14 01:15:07 +00: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
ortho_4x12	Merge remote-tracking branch 'upstream/master' into develop	2021-08-19 11:32:23 -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
planck_mit
split_3x5_3/manna-harbour_miryoku
split_3x6_3	[Keymap] Drashna split transport improvement (#13905)	2021-08-07 21:40:48 -07:00
tkl_ansi