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
This commit is contained in:
parent
bf11b7dc1b
commit
8494132faf