Commit 1465934b authored by Sarah Grebing's avatar Sarah Grebing

Merge remote-tracking branch 'remotes/origin/master' into luongSavepointTemp

# Conflicts:
#	ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
parent 6dbcf7e6
Pipeline #21935 passed with stages
in 5 minutes and 18 seconds