Skip to content
Snippets Groups Projects
Commit 580f1486 authored by ck85nori's avatar ck85nori :railway_track:
Browse files

Merge branch 'main' into 'feature/personal' 

# Conflicts:
#   README.md
parents 2b38aa2c e53ecb1a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
README.md
+ 1
− 0
View file @ 580f1486
......@@ -6,5 +6,6 @@ it can do
- b
- c
- d
- schaukel
# Acknowledgements
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