]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'dev'
authorAdam Lee <adam@bigtuna.io>
Sun, 7 May 2017 21:44:28 +0000 (14:44 -0700)
committerAdam Lee <adam@bigtuna.io>
Sun, 7 May 2017 21:44:28 +0000 (14:44 -0700)

Trivial merge