Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into tobin
# Conflicts:
# src/app/home/dashboard/dashboard.component.html
# src/styles.scss
Showing
... | @@ -17,16 +17,20 @@ | ... | @@ -17,16 +17,20 @@ |
"@angular/compiler": "~7.1.0", | "@angular/compiler": "~7.1.0", | ||
"@angular/core": "~7.1.0", | "@angular/core": "~7.1.0", | ||
"@angular/forms": "~7.1.0", | "@angular/forms": "~7.1.0", | ||
"@angular/http": "^7.2.0", | |||
"@angular/platform-browser": "~7.1.0", | "@angular/platform-browser": "~7.1.0", | ||
"@angular/platform-browser-dynamic": "~7.1.0", | "@angular/platform-browser-dynamic": "~7.1.0", | ||
"@angular/router": "~7.1.0", | "@angular/router": "~7.1.0", | ||
"@google/maps": "^0.5.5", | |||
"angular-star-rating": "^4.0.0-beta.3", | "angular-star-rating": "^4.0.0-beta.3", | ||
"angular-wizard-form": "^0.4.1", | "angular-wizard-form": "^0.4.1", | ||
"bootstrap": "^4.1.3", | "bootstrap": "^4.1.3", | ||
"core-js": "^2.5.4", | "core-js": "^2.5.4", | ||
"hammerjs": "^2.0.8", | "hammerjs": "^2.0.8", | ||
"jquery": "^3.3.1", | "jquery": "^3.3.1", | ||
"mt-latlon": "^0.1.1", | |||
"ng2-archwizard": "^2.1.0", | "ng2-archwizard": "^2.1.0", | ||
"ng2-file-upload": "^1.3.0", | |||
"ngx-carousel": "^1.3.5", | "ngx-carousel": "^1.3.5", | ||
"ngx-google-places-autocomplete": "^2.0.3", | "ngx-google-places-autocomplete": "^2.0.3", | ||
"ngx-slick": "^0.2.1", | "ngx-slick": "^0.2.1", | ||
... | ... |
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment