Commit 5310d1e
committed
Merge branch 'master' of https://github.com/DevExpress/devextreme-cli into master_update_ng20
# Conflicts:
# package-lock.json
# packages/devextreme-schematics/package-lock.json
# packages/devextreme-schematics/package.json11 files changed
Lines changed: 955 additions & 359 deletions
File tree
- packages
- devextreme-cli
- src/utility
- devextreme-schematics
- src
- add-app-template
- install
- utility
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
0 commit comments