Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if

2022-05-12 20:46:00 +02:00
parent e81ddaa1a5 ee99c3312e
commit ac34bcbb3d
7 changed files with 15 additions and 7 deletions
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 129 translations.
- * Generated on: 2022-05-12 14:08:08
+ * Generated on: 2022-05-12 20:45:27
 */
 #include "translateObjects.h"