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

Trivial merge