]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e7cfa8 b8e1316)
Merge branch 'master' into feature/combos
authorOfer Plesser <plesserofer@gmail.com>
Fri, 16 Dec 2016 19:52:51 +0000 (21:52 +0200)
committerOfer Plesser <plesserofer@gmail.com>
Fri, 16 Dec 2016 19:52:51 +0000 (21:52 +0200)

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