]> git.donarmstrong.com Git - qmk_firmware.git/commit
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)
commit430151dd51b8b0d925850ad4d52c8bae41d3c154
treef3d13283dd812277bc30d75dff32ea16508b58c8
parent175db1a549a46518c2f2511ac1624d594eb07216
parent5ad103fa51083cb26d3516e5598b7b2a099b1521
Merge remote-tracking branch 'upstream/master'

# Conflicts:
# docs/faq_keymap.md