-
https://gitlab.com/acubesat/obc/ecss-servicesathatheocsd authored
Merge branch 'master' of https://gitlab.com/acubesat/obc/ecss-services into ECSS_ST-05_enable_disable # Conflicts: # src/main.cpp
https://gitlab.com/acubesat/obc/ecss-servicesathatheocsd authoredMerge branch 'master' of https://gitlab.com/acubesat/obc/ecss-services into ECSS_ST-05_enable_disable # Conflicts: # src/main.cpp