From: That-Canadian <poole.chris.11@gmail.com>
Date: Sun, 13 Aug 2017 18:11:40 +0000 (-0400)
Subject: Merge branch 'master' into minidox
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1631f7cd798dcf428404977e441d7e5b65fe81ce;p=qmk_firmware.git

Merge branch 'master' into minidox
---

1631f7cd798dcf428404977e441d7e5b65fe81ce