Skip to content

Commit

Permalink
Merge branch 'or-condition-in-news' into custom-object-editor
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/admin/io-package.json
  • Loading branch information
GermanBluefox committed Nov 23, 2024
2 parents 1cb057f + 2b4babc commit 12d2030
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ The icons may not be reused in other projects without the proper flaticon licens
- (@GermanBluefox) Made improvement for JSONConfig components
- (@GermanBluefox) Added clear button to text area JSON config component

### 7.4.1 (2024-11-19)

- (@GermanBluefox) Made improvement for JSONConfig components

### 7.4.0 (2024-11-17)

- (@GermanBluefox) Added new JsonConfig control: staticInfo
Expand All @@ -112,11 +116,6 @@ The icons may not be reused in other projects without the proper flaticon licens
- (@GermanBluefox) Trying to fix a GUI build process
- (@GermanBluefox) Changed license icon

### 7.2.4 (2024-10-08)

- (@GermanBluefox) Corrected some GUI errors
- (@GermanBluefox) Ignore error by opening `0_userdata.0`

## License

The MIT License (MIT)
Expand Down
2 changes: 1 addition & 1 deletion packages/dm-gui-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@iobroker/dm-gui-components",
"version": "7.4.0",
"version": "7.4.1",
"description": "ReactJS components to develop admin interface for ioBroker device manager.",
"author": {
"name": "Jey Cee",
Expand Down

0 comments on commit 12d2030

Please sign in to comment.