Merge branch 'rest' into rest-authenticator (772130aa) · Commits · semestres / DIM0614 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

D

DIM0614
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

772130aa

Commit 772130aa authored 2 years ago by mariaeloi

Downloads
- Plain Diff

Merge branch 'rest' into rest-authenticator

parents 1d058a67 6d4b8379

No related branches found

No related tags found

2 merge requests!5Rest,!4Rest authenticator

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java 2 additions, 2 deletions

...ava/br/ufrn/imd/balance/controller/BalanceController.java
WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class 0 additions, 0 deletions

...es/br/ufrn/imd/balance/controller/BalanceController.class
WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java 22 additions, 10 deletions

.../src/main/java/br/ufrn/imd/client/utils/MachineState.java
WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java 3 additions, 3 deletions

...ent/src/main/java/br/ufrn/imd/client/utils/NameSpace.java
WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java 1 addition, 1 deletion

...ava/br/ufrn/imd/deposit/controller/DepositController.java
WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java 1 addition, 1 deletion

...a/br/ufrn/imd/transfer/controller/TransferController.java

with 29 additions and 17 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