]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into minidox
authorThat-Canadian <poole.chris.11@gmail.com>
Sun, 13 Aug 2017 18:11:40 +0000 (14:11 -0400)
committerThat-Canadian <poole.chris.11@gmail.com>
Sun, 13 Aug 2017 18:11:40 +0000 (14:11 -0400)

Trivial merge