anhefti 2809acc432 Merge remote-tracking branch 'origin/dev-lms-open-olat' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/olat/OlatLmsAPITemplate.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/olat/OlatLmsAPITemplateFactory.java		2021-05-18 09:02:23 +02:00
..
sebserver	Merge remote-tracking branch 'origin/dev-lms-open-olat' into development	2021-05-18 09:02:23 +02:00