Merge branch 'master' into create-ticket-localstorage
# Conflicts: # src/app/admin/admin-ticket/admin-ticket-customer-md/admin-ticket-customer-md.component.html
Showing
{ | { | ||
"name": "smart-city", | "name": "smart-city", | ||
"version": "2.1.1", | "version": "2.1.2", | ||
"scripts": { | "scripts": { | ||
"ng": "ng", | "ng": "ng", | ||
"start": "ng serve", | "start": "ng serve", | ||
... | ... |
Please
register
or
sign in
to comment