]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/qmk/qmk_firmware
authorJack Humbert <jack.humb@gmail.com>
Tue, 30 May 2017 15:46:34 +0000 (11:46 -0400)
committerJack Humbert <jack.humb@gmail.com>
Tue, 30 May 2017 15:46:34 +0000 (11:46 -0400)

Trivial merge