Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa
# Conflicts:
# package-lock.json
Showing
... | ... | @@ -26,7 +26,7 @@ |
"@google/maps": "^0.5.5", | ||
"angular-star-rating": "^4.0.0-beta.3", | ||
"angular-wizard-form": "^0.4.1", | ||
"bootstrap": "^4.1.3", | ||
"bootstrap": "^4.3.1", | ||
"core-js": "^2.5.4", | ||
"font-awesome": "^4.7.0", | ||
"hammerjs": "^2.0.8", | ||
... | ... |
Please
register
or
sign in
to comment