2 Commits

Author	SHA1	Message	Date
Christoph	551534d4ff	Merge branch 'master' into refactor-controller ... # Conflicts: # src/main/java/mops/gruppen2/controller/WebController.java	2020-03-25 13:03:22 +01:00
[Mahgs]	2d3e935d64	merged with master and fixed some problems	2020-03-24 16:31:55 +01:00