4 Commits

Author	SHA1	Message	Date
Jakob.Meier	ba5832d30e	fixed merge conflicts	2021-06-21 17:51:08 +02:00
Robin Mueller	5bbf0255ef	fixes for updated fsfw	2021-06-21 16:54:33 +02:00
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