Skip to content
Snippets Groups Projects
Commit a3e1adda authored by athatheocsd's avatar athatheocsd
Browse files

Merge branch 'master' of gitlab.com:acubesat/obc/ecss-services into ECSS_ST-05_enable_disable

# Conflicts:
#	CMakeLists.txt

Added some subservice observable 6.5.6 of the standard.
parents 6de9b5a6 d37ec7c2
No related branches found
No related tags found
No related merge requests found
Showing
with 529 additions and 299 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment