Skip to content
Snippets Groups Projects
Commit 33490fbe authored by xd44woco's avatar xd44woco
Browse files

Merge branch 'main' into 'feature/g'

# Conflicts:
#   README.md
parents c93eadea 4c17426a
Branches feature/g
No related tags found
No related merge requests found
......@@ -6,4 +6,7 @@ it can do:
- b
- c
- d
- g
\ No newline at end of file
- g
- now also including e
- hello it's esther!
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