]> 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>
Sun, 8 Jan 2017 19:48:07 +0000 (02:48 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sun, 8 Jan 2017 19:48:07 +0000 (02:48 +0700)

Trivial merge