From: Jack Humbert <jack.humb@gmail.com>
Date: Tue, 12 Jun 2018 14:59:35 +0000 (-0400)
Subject: Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox
X-Git-Url: https://git.donarmstrong.com/?p=qmk_firmware.git;a=commitdiff_plain;h=998ddbb122c9d3e2a77bd4e88c881b225ca0d569

Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox
---

998ddbb122c9d3e2a77bd4e88c881b225ca0d569