Browse Source

Merge remote-tracking branch 'origin/gateway-list' into gateway_list

# Conflicts:
#	application/src/main/data/json/system/widget_bundles/gateway_widgets.json

pull/8337/head

Maksym Dudnik 3 years ago

parent

c9b9959f47 2be23ba39a

commit

c83667702f

1 changed files with 19 additions and 0 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

1. 19
     application/src/main/data/json/system/widget_bundles/cards.json

19

application/src/main/data/json/system/widget_bundles/cards.json

View File

File diff suppressed because one or more lines are too long

Write Preview

Loading…

Cancel

Save