Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build/reports/tests/test/classes/ch.unibas.dmi.dbis.cs108.example.HelloWorldTest.html
#	build/reports/tests/test/index.html
#	build/reports/tests/test/packages/ch.unibas.dmi.dbis.cs108.example.html
#	build/test-results/test/TEST-ch.unibas.dmi.dbis.cs108.example.HelloWorldTest.xml
#	build/test-results/test/binary/results.bin
This commit is contained in:
Sebastian 2022-03-14 13:43:47 +01:00
commit 234ec707f7

Diff Content Not Available