]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into hf/shinydox
authorErez Zukerman <bulk@ezuk.org>
Tue, 15 May 2018 14:50:24 +0000 (10:50 -0400)
committerErez Zukerman <bulk@ezuk.org>
Tue, 15 May 2018 14:50:24 +0000 (10:50 -0400)

Trivial merge