reynisson 3442702197 Merge remote-tracking branch 'origin/roster_tests' into roster_tests ... # Conflicts: # roster/src/main/java/ch/unisg/roster/RosterApplication.java		2021-11-26 13:40:13 +01:00
..
.mvn/wrapper	rename assignment to roster & added executor registry to roster	2021-11-08 14:23:27 +01:00
src	Merge remote-tracking branch 'origin/roster_tests' into roster_tests	2021-11-26 13:40:13 +01:00
.gitignore	rename assignment to roster & added executor registry to roster	2021-11-08 14:23:27 +01:00
Dockerfile	rename assignment to roster & added executor registry to roster	2021-11-08 14:23:27 +01:00
mvnw	rename assignment to roster & added executor registry to roster	2021-11-08 14:23:27 +01:00
mvnw.cmd	rename assignment to roster & added executor registry to roster	2021-11-08 14:23:27 +01:00
pom.xml	deployment fixes	2021-11-25 17:49:49 +01:00