2 Commits

Author	SHA1	Message	Date
Jakob.Meier	46d49e130b	fixed merge conflicts	2021-06-11 14:55:28 +02:00
Robin Mueller	de82746f40	using configuration files now	2021-06-08 17:04:28 +02:00