]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge pull request #2 from qmk/master
authorNick Choi <nikchi@users.noreply.github.com>
Tue, 30 May 2017 18:17:48 +0000 (14:17 -0400)
committerGitHub <noreply@github.com>
Tue, 30 May 2017 18:17:48 +0000 (14:17 -0400)
pull in new qmk changes


Trivial merge