Skip to content
Snippets Groups Projects
Commit f0f235cd authored by OndraRehounek's avatar OndraRehounek
Browse files

Merge branch 'feature/pirati-cz' into feature/pirati-cz-dan

# Conflicts:
#	main/static/main/css/styles.css
parents 22f2bc0c 8cc08b70
No related branches found
No related tags found
3 merge requests!607Pirati.cz,!603[FIX]Headerstyle,!575Feature/pirati cz
Pipeline #9591 passed
Showing
with 64 additions and 224 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment