]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorclimbalima <climbalima@gmail.com>
Sun, 11 Dec 2016 04:15:47 +0000 (23:15 -0500)
committerclimbalima <climbalima@gmail.com>
Sun, 11 Dec 2016 04:15:47 +0000 (23:15 -0500)

Trivial merge