Skip to content
Snippets Groups Projects
Commit 47c51c90 authored by steltze's avatar steltze
Browse files

Merge branch 'conan-x86-specifications' into 'master' 

Conan x86 specifications

See merge request acubesat/obc/ecss-services!151
parents e60b57d9 81bbe5b3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment