Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into devel
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/knx/group_object.cpp
  • Loading branch information
@cornelius-koepp
cornelius-koepp committed Feb 12, 2024
2 parents 9ab6b6c + 57b5b05 commit a12ff2d
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit a12ff2d

Please sign in to comment.