]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' into default_atreus_layout
authorHugh Enxing <henxing@draper.com>
Tue, 28 Mar 2017 16:11:49 +0000 (12:11 -0400)
committerHugh Enxing <henxing@draper.com>
Tue, 28 Mar 2017 16:11:49 +0000 (12:11 -0400)

Trivial merge