]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
authorJack Humbert <jack.humb@gmail.com>
Mon, 19 Dec 2016 16:18:22 +0000 (11:18 -0500)
committerJack Humbert <jack.humb@gmail.com>
Mon, 19 Dec 2016 16:18:22 +0000 (11:18 -0500)
1  2 
keyboards/ergodox/ez/config.h

Simple merge