Commit 6d8c6d4
committed
Merge branch 'master' of https://github.com/DevExpress/devextreme-cli
# Conflicts:
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-fluent-xsmall-add-view-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-fluent-xsmall-home-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-fluent-xsmall-profile-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-fluent-xsmall-tasks-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-fluent-xsmall-toggle-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-fluent-xsmall-user-panel-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-generic-xsmall-tasks-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-generic-xsmall-user-panel-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-material-xsmall-add-view-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-material-xsmall-home-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-material-xsmall-profile-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-material-xsmall-tasks-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-material-xsmall-toggle-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-inner-toolbar-material-xsmall-user-panel-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-fluent-xsmall-add-view-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-fluent-xsmall-home-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-fluent-xsmall-profile-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-fluent-xsmall-tasks-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-fluent-xsmall-toggle-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-fluent-xsmall-user-panel-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-generic-xsmall-tasks-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-generic-xsmall-user-panel-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-material-xsmall-add-view-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-material-xsmall-home-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-material-xsmall-profile-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-material-xsmall-tasks-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-material-xsmall-toggle-snap.png
# packages/devextreme-cli/testing/__tests__/__image_snapshots__/side-nav-outer-toolbar-material-xsmall-user-panel-snap.pngFile tree
9 files changed
+2195
-1085
lines changed- packages
- devextreme-cli
- src/utility
- devextreme-schematics
- src
- add-app-template
- install
- utility
9 files changed
+2195
-1085
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
0 commit comments