Skip to content
Snippets Groups Projects
Commit cd047744 authored by Daniel Kriz's avatar Daniel Kriz
Browse files

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

# Conflicts:
#	main/static/main/css/styles.css
#	main/static/main/js/main.bundle.js
#	main/templates/main/blocks/news_block.html
parents 2a860c26 f974e131
No related branches found
No related tags found
3 merge requests!607Pirati.cz,!603[FIX]Headerstyle,!575Feature/pirati cz
Showing
with 250 additions and 85 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment