From: jpetermans <tibcmhhm@gmail.com>
Date: Wed, 24 May 2017 19:07:18 +0000 (-0700)
Subject: Merge branch 'user_led_configuration' into infinity60
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e6c9b07e1c9f508c8a2a4d5e920816c34c6a21f4;p=qmk_firmware.git

Merge branch 'user_led_configuration' into infinity60

Conflicts:
	keyboards/infinity60/keymaps/jpetermans/keymap.c
---

e6c9b07e1c9f508c8a2a4d5e920816c34c6a21f4