anhefti d2ea6eb316 Merge remote-tracking branch 'origin/dev-1.3' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockupLmsAPITemplate.java		2022-04-27 13:47:47 +02:00
..
main	Merge remote-tracking branch 'origin/dev-1.3' into development	2022-04-27 13:47:47 +02:00
test	Merge remote-tracking branch 'origin/dev-1.3' into development	2022-04-27 13:47:47 +02:00