Merge remote-tracking branch 'origin/master' into develop
2 files changed, 2 insertions(+), 1 deletions(-) M keyboards/takashicompany/compacx/keymaps/via/rules.mk M keyboards/takashicompany/compacx/rules.mk
M keyboards/takashicompany/compacx/keymaps/via/rules.mk => keyboards/takashicompany/compacx/keymaps/via/rules.mk +1 -1
M keyboards/takashicompany/compacx/rules.mk => keyboards/takashicompany/compacx/rules.mk +1 -0