]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8665ed3 aaa67f6)
Merge remote-tracking branch 'upstream/master'
authorStick <nstickney@gmail.com>
Sat, 3 Jun 2017 00:50:54 +0000 (19:50 -0500)
committerStick <nstickney@gmail.com>
Sat, 3 Jun 2017 00:50:54 +0000 (19:50 -0500)

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