]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5df74f3 153eb95)
Merge remote-tracking branch 'upstream/master' into user_led_configuration
authorjpetermans <tibcmhhm@gmail.com>
Mon, 8 May 2017 22:24:50 +0000 (15:24 -0700)
committerjpetermans <tibcmhhm@gmail.com>
Mon, 8 May 2017 22:24:50 +0000 (15:24 -0700)

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