3 Commits

Author	SHA1	Message	Date
Jakob.Meier	77970418d8	resolved merge conflicts	2020-11-25 16:17:16 +01:00
Robin.Mueller	243f7fb49c	todo added	2020-11-20 18:32:06 +01:00
Robin Mueller	909706c529	restructured.. a bit	2020-11-20 18:10:39 +01:00