summaryrefslogtreecommitdiffstats
path: root/keyboards/amj40/keymaps/default/updatemerge.sh
Commit message (Collapse)AuthorAgeFilesLines
* included amj40 implementation of nhou7 from ↵Fabian Topfstedt2017-07-261-0/+4
https://github.com/nhou7/qmk_firmware_amj40