From: Jack Humbert <jack.humb@gmail.com>
Date: Tue, 15 May 2018 15:36:57 +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=6dc215cd679d54ca2ab985c21c9bb299aca74b01

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

6dc215cd679d54ca2ab985c21c9bb299aca74b01