]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge remote-tracking branch 'upstream/master' into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Wed, 19 Apr 2017 05:04:15 +0000 (12:04 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Wed, 19 Apr 2017 05:04:15 +0000 (12:04 +0700)

Trivial merge