]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audio
authorJack Humbert <jack.humb@gmail.com>
Tue, 27 Jun 2017 18:21:42 +0000 (14:21 -0400)
committerJack Humbert <jack.humb@gmail.com>
Tue, 27 Jun 2017 18:21:42 +0000 (14:21 -0400)

Trivial merge