Merge remote-tracking branch 'origin/main' into cfdp-state-machines
Some checks failed
Rust/sat-rs/pipeline/pr-main There was a failure building this commit

This commit is contained in:
Robin Müller 2023-09-10 19:16:27 +02:00
commit b17b53abe3
Signed by: muellerr
GPG Key ID: A649FB78196E3849
2 changed files with 3 additions and 1 deletions

2
NOTICE
View File

@ -1 +1,3 @@
This software contains code developed at the University of Stuttgart's Institute of Space Systems. This software contains code developed at the University of Stuttgart's Institute of Space Systems.
The sat-rs logo was designed by Nadine Eunous.

View File

@ -1,4 +1,4 @@
<p align="center"> <img src="misc/logo.png" width="40%"> </p> <p align="center"> <img src="misc/satrs-logo.png" width="40%"> </p>
sat-rs sat-rs
========= =========