]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge pull request #1115 from Skrymir/master
authorJack Humbert <jack.humb@gmail.com>
Wed, 22 Feb 2017 04:34:23 +0000 (23:34 -0500)
committerGitHub <noreply@github.com>
Wed, 22 Feb 2017 04:34:23 +0000 (23:34 -0500)
Update from upstream


Trivial merge