]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5272218 f66e0a2)
Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox
authorJack Humbert <jack.humb@gmail.com>
Tue, 15 May 2018 15:36:57 +0000 (11:36 -0400)
committerJack Humbert <jack.humb@gmail.com>
Tue, 15 May 2018 15:36:57 +0000 (11:36 -0400)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.