Merge branch 'master' of https://gitlab.fing.edu.uy/matefun/Frontend (051dbbbb) · Commits · matefun / Frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

Frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

051dbbbb

Commit 051dbbbb authored 5 years ago by Ignacio Fagian

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.fing.edu.uy/matefun/Frontend

parents 40933198 53a7bdd4

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Frontend Angular 4/src/app/shared/config.ts 4 additions, 4 deletions

Frontend Angular 4/src/app/shared/config.ts
Servidor JEE/WebContent/WEB-INF/matefun.properties 3 additions, 3 deletions

Servidor JEE/WebContent/WEB-INF/matefun.properties
Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun 0 additions, 0 deletions

Servidor JEE/src/main/java/edu/proygrado/binarios/MateFun
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po 557 additions, 0 deletions

...in/java/edu/proygrado/binarios/internationalization/en.po
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po 558 additions, 0 deletions

...in/java/edu/proygrado/binarios/internationalization/es.po
Servidor JEE/src/main/resources/META-INF/persistence.xml 0 additions, 1 deletion

Servidor JEE/src/main/resources/META-INF/persistence.xml

with 1122 additions and 8 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