Merge pull request #10794 from abpframework/auto-merge/rel-5-0/664

Merge branch dev with rel-5.0
pull/10805/head
Bunyamin Coskuner 4 years ago committed by GitHub
commit ec7aeddf29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -37,17 +37,6 @@
},
"private": true,
"devDependencies": {
"@abp/ng.account": "~5.0.0-rc.1",
"@abp/ng.account.core": "~5.0.0-rc.1",
"@abp/ng.core": "~5.0.0-rc.1",
"@abp/ng.feature-management": "~5.0.0-rc.1",
"@abp/ng.identity": "~5.0.0-rc.1",
"@abp/ng.permission-management": "~5.0.0-rc.1",
"@abp/ng.schematics": "~5.0.0-rc.1",
"@abp/ng.setting-management": "~5.0.0-rc.1",
"@abp/ng.tenant-management": "~5.0.0-rc.1",
"@abp/ng.theme.basic": "~5.0.0-rc.1",
"@abp/ng.theme.shared": "~5.0.0-rc.1",
"@abp/utils": "~5.0.0-rc.1",
"@angular-devkit/build-angular": "12.2.13",
"@angular-devkit/build-ng-packagr": "^0.1002.0",
@ -62,15 +51,15 @@
"@angular/compiler-cli": "12.2.13",
"@angular/core": "12.2.13",
"@angular/forms": "12.2.13",
"@angular/localize": "12.2.13",
"@angular/language-service": "12.2.13",
"@angular/localize": "12.2.13",
"@angular/platform-browser": "12.2.13",
"@angular/platform-browser-dynamic": "12.2.13",
"@angular/router": "12.2.13",
"@fortawesome/fontawesome-free": "^5.15.4",
"@ng-bootstrap/ng-bootstrap": "11.0.0-beta.2",
"@ngneat/spectator": "^8.0.3",
"@ngx-validate/core": "^0.0.13",
"@ngx-validate/core": "^0.1.1",
"@nrwl/angular": "13.1.3",
"@nrwl/cli": "13.1.3",
"@nrwl/cypress": "13.1.3",

@ -10,7 +10,7 @@
"@abp/ng.core": "~5.0.0-rc.1",
"@fortawesome/fontawesome-free": "^5.15.4",
"@ng-bootstrap/ng-bootstrap": "11.0.0-beta.2",
"@ngx-validate/core": "^0.0.13",
"@ngx-validate/core": "^0.1.1",
"@swimlane/ngx-datatable": "^19.0.0",
"bootstrap": "^5.1.1",
"tslib": "^2.0.0"

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save