LordGrey 8494132faf Merge branch 'master' into Razer_Chroma_Support ... # Conflicts: # assets/webconfig/i18n/en.json # assets/webconfig/js/content_leds.js # libsrc/leddevice/dev_net/ProviderRestApi.cpp # libsrc/leddevice/dev_net/ProviderRestApi.h		2021-11-01 15:41:49 +01:00
..
firmware	Refactor PR #957 (#1234)	2021-05-01 17:00:44 +02:00
webconfig	Merge branch 'master' into Razer_Chroma_Support	2021-11-01 15:41:49 +01:00