]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into improve_macro_docs
authorJack Humbert <jack.humb@gmail.com>
Sat, 10 Jun 2017 16:26:57 +0000 (12:26 -0400)
committerGitHub <noreply@github.com>
Sat, 10 Jun 2017 16:26:57 +0000 (12:26 -0400)

Trivial merge