]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Mon, 13 Feb 2017 10:58:42 +0000 (17:58 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Mon, 13 Feb 2017 10:58:42 +0000 (17:58 +0700)

Trivial merge