Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

Equipo 3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f7fc6df0

Commit f7fc6df0 authored 5 months ago by migudel

:speech_balloon:

Downloads
- Patches
- Plain Diff

Conflictos II

parent b0737484

Branches develop

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

angular/RestClient/src/app/app.routes.ts 93 additions, 14 deletions

angular/RestClient/src/app/app.routes.ts
java/services/auth/src/main/java/com/uva/authentication/models/remote/User.java 95 additions, 0 deletions

.../main/java/com/uva/authentication/models/remote/User.java

with 188 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment