]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck
authorIBNobody <ibnobody@gmail.com>
Sun, 17 Apr 2016 00:32:29 +0000 (19:32 -0500)
committerIBNobody <ibnobody@gmail.com>
Sun, 17 Apr 2016 00:32:29 +0000 (19:32 -0500)

Trivial merge