Merge branch 'master' into custom-object-editor

# Conflicts: # packages/admin/io-package.json # packages/admin/src-admin/package.json # packages/admin/src-admin/src/components/Object/ObjectBrowserEditObject.tsx
ioBroker · Nov 23, 2024 · 390b22c · 390b22c
2 parents 12d2030 + 682487b
commit 390b22c
Show file tree

Hide file tree

Showing 4 changed files with 613 additions and 610 deletions.
diff --git a/packages/adapter-react-v5/src/assets/devices.json b/packages/adapter-react-v5/src/assets/devices.json
diff --git a/packages/adapter-react-v5/src/assets/rooms.json b/packages/adapter-react-v5/src/assets/rooms.json