]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox
authorJack Humbert <jack.humb@gmail.com>
Tue, 12 Jun 2018 14:59:35 +0000 (10:59 -0400)
committerJack Humbert <jack.humb@gmail.com>
Tue, 12 Jun 2018 14:59:35 +0000 (10:59 -0400)

Trivial merge