]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into coderkun_neo2
authorcoderkun <olli@coderkun.de>
Sun, 2 Oct 2016 08:04:29 +0000 (10:04 +0200)
committercoderkun <olli@coderkun.de>
Sun, 2 Oct 2016 08:04:29 +0000 (10:04 +0200)

Trivial merge