From: That-Canadian <poole.chris.11@gmail.com>
Date: Sat, 15 Jul 2017 01:35:50 +0000 (-0400)
Subject: Merge branch 'master' into minidox
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6c9b69a4b67e064dacea364f842bf15631d7a5e6;p=qmk_firmware.git

Merge branch 'master' into minidox
---

6c9b69a4b67e064dacea364f842bf15631d7a5e6