Skip to content
Snippets Groups Projects
Commit 4a257f3e authored by migudel's avatar migudel :speech_balloon:
Browse files

Merge branch 'develop' into 'dev_bookingRequest' 

# Conflicts:
#   angular/RestClient/src/app/app.config.ts
#   angular/RestClient/src/app/app.routes.ts
#   angular/RestClient/src/app/shared/cliente-api-rest.service.ts
parents 290840e8 c3427c84
No related branches found
No related tags found
2 merge requests!10Add ts types and json mocks, remove poblate scripts and fix the cascade...,!9Dev booking request
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1456 additions and 1227 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment