]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 175db1a 5ad103f)
Merge remote-tracking branch 'upstream/master'
authorBalz Guenat <balz.guenat@gmail.com>
Sat, 12 Aug 2017 10:14:33 +0000 (12:14 +0200)
committerBalz Guenat <balz.guenat@gmail.com>
Sat, 12 Aug 2017 10:14:33 +0000 (12:14 +0200)
# Conflicts:
# docs/faq_keymap.md


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