Merge remote-tracking branch 'origin/master' into devel

Browse Source

# Conflicts:
#	src/knx/group_object.cpp

...

This commit is contained in:

Cornelius Köpp

2024-02-12 10:24:12 +01:00

parent 9ab6b6c51a 57b5b05ce1

commit a12ff2dcf8

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

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

Diff Content Not Available