Merge branch 'master' into develop

6c34299c · Andreas Schmidt · ecd683bb · f463a130 · 6c34299c · 956abea5
Commit 6c34299c authored Sep 17, 2019 by Andreas Schmidt
--- a/.gitmodules
+++ b/.gitmodules
 [submodule "prrt/xlap"]
 	path = prrt/xlap
-	url = ../../as/X-Lap.git
+	url = ../X-Lap.git
--- a/xlap @ 956abea5
+++ b/xlap @ 956abea5
-Subproject commit b87b0b7953c279c4acde42f2b3535c309048d8ab
+Subproject commit 956abea52c2a88e6d5124a5bf04289a1c2563ca4