Skip to content
Snippets Groups Projects
Commit 58c68dbe authored by Timofej Paramonov Bliki's avatar Timofej Paramonov Bliki :heart:
Browse files

Merge branch 'main' into 'team' 

# Conflicts:
#   wiki/pages/team.html

Fixed conflicts, which occurred as minor changes to the name were maid to Team outside of the Team branch.
parents e8cc7ae6 cee1819f
No related branches found
No related tags found
1 merge request!21Vasilis + Henriete
Pipeline #443973 failed
Stage: build
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