Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feat/53/plc4x-v1' into feat/53/p…
Browse files Browse the repository at this point in the history 
…lc4x-v1

# Conflicts:
#	hivemq-edge/src/frontend/src/modules/ProtocolAdapters/hooks/useGetUISchema.ts
  • Loading branch information
@simon622
simon622 committed Sep 13, 2023
2 parents 488f04e + 9cfbb76 commit bc55f1e
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit bc55f1e

Please sign in to comment.