Merge pull request #1184 from osamuaoki/master 0.5.38
authorJack Humbert <jack.humb@gmail.com>
Thu, 30 Mar 2017 12:45:56 +0000 (08:45 -0400)
committerGitHub <noreply@github.com>
Thu, 30 Mar 2017 12:45:56 +0000 (08:45 -0400)
Update keymap.md to QMK

1  2 
doc/keymap.md
quantum/template/template.h

diff --cc doc/keymap.md
Simple merge
Simple merge