From: That-Canadian <poole.chris.11@gmail.com>
Date: Mon, 7 Aug 2017 12:00:02 +0000 (-0400)
Subject: Merge branch 'master' into minidox
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1bbb49585ee1aef347b7c3397bc9f83040289402;p=qmk_firmware.git

Merge branch 'master' into minidox
---

1bbb49585ee1aef347b7c3397bc9f83040289402