Merge branch 'master' into Razer_Chroma_Support

Browse Source

# 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:

LordGrey 2021-11-01 15:41:49 +01:00

parent bf11b7dc1b

commit 8494132faf

1 changed files with 1540 additions and 608 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2142

assets/webconfig/js/content_leds.js Normal file → Executable file

View File

File diff suppressed because it is too large Load Diff