From: jpetermans Date: Mon, 8 May 2017 22:42:27 +0000 (-0700) Subject: Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_firmware... X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b5675e20255a9306097ad58dabc8727a2c190946;p=qmk_firmware.git 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 --- b5675e20255a9306097ad58dabc8727a2c190946