]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into minidox
authorThat-Canadian <poole.chris.11@gmail.com>
Mon, 10 Jul 2017 20:53:49 +0000 (16:53 -0400)
committerThat-Canadian <poole.chris.11@gmail.com>
Mon, 10 Jul 2017 20:53:49 +0000 (16:53 -0400)

Trivial merge