Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_firmware into user_led_configuration

Conflicts:
	keyboards/infinity60/led_controller.c
	keyboards/infinity60/led_controller.h
This commit is contained in:
jpetermans 2017-05-08 15:42:27 -07:00
commit b5675e2025

Diff content is not available