Skip to content
Snippets Groups Projects
Commit 956a6889 authored by Ferreira Pires, Luis (UT-EEMCS)'s avatar Ferreira Pires, Luis (UT-EEMCS)
Browse files

Merge branch 'master' of https://gitlab.utwente.nl/soa-course/workshop-http 

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
#	src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
parents c94161ad d8c5d204
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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