]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
authorNicholas Keene <git@nicholaskeene.com>
Tue, 3 May 2016 02:35:58 +0000 (21:35 -0500)
committerNicholas Keene <git@nicholaskeene.com>
Tue, 3 May 2016 02:35:58 +0000 (21:35 -0500)

Trivial merge