Commit 45852c9bba7d8ecbf38c566ee3421afa972cbe55

Authored by Igor Kulikov
2 parents 2a7e220f 294b0e9e

Merge branch 'master' into develop/3.0

... ... @@ -5,7 +5,7 @@
5 5 "94715984-ae74-76e4-20b7-2f956b01ed80": {
6 6 "isSystemType": true,
7 7 "bundleAlias": "entity_admin_widgets",
8   - "typeAlias": "device_admin_table2",
  8 + "typeAlias": "device_admin_table",
9 9 "type": "latest",
10 10 "title": "New widget",
11 11 "sizeX": 24,
... ... @@ -1264,4 +1264,4 @@
1264 1264 }
1265 1265 },
1266 1266 "name": "Gateways"
1267   -}
\ No newline at end of file
  1267 +}
... ...
... ... @@ -6,7 +6,7 @@
6 6 },
7 7 "widgetTypes": [
8 8 {
9   - "alias": "device_admin_table2",
  9 + "alias": "device_admin_table",
10 10 "name": "Device admin table",
11 11 "descriptor": {
12 12 "type": "latest",
... ... @@ -22,7 +22,7 @@
22 22 }
23 23 },
24 24 {
25   - "alias": "device_admin_table",
  25 + "alias": "asset_admin_table",
26 26 "name": "Asset admin table",
27 27 "descriptor": {
28 28 "type": "latest",
... ...