]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bee9183 154305c)
Merge remote-tracking branch 'upstream/master'
authorStick <nstickney@gmail.com>
Thu, 6 Apr 2017 18:52:53 +0000 (13:52 -0500)
committerStick <nstickney@gmail.com>
Thu, 6 Apr 2017 18:52:53 +0000 (13:52 -0500)

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