Commit d053de4a authored by Martin Deinhofer's avatar Martin Deinhofer
Browse files

merged conflict

parents ac6cacce afb88def
# StudyATHome Internationally
# StudyATHome Internationally (Public Repository)
This is the public repository of the [StudyATHome Internationally project](https://embsys.technikum-wien.at/projects/studyathome-intl/index.php). It will be used to collect, edit and host project outcomes.
## Contents
......
Markdown is supported
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