Merge remote-tracking branch 'origin/master' into develop
1 files changed, 0 insertions(+), 0 deletions(-)
R layouts/default/tkl_f13_jis/default_tkl_f13_jis/{keymaps.c => keymap.c}
R layouts/default/tkl_f13_jis/default_tkl_f13_jis/keymaps.c => layouts/default/tkl_f13_jis/default_tkl_f13_jis/keymap.c +0 -0