Skip to content
Commit c6e1fc78 authored by Norbert Komiňák's avatar Norbert Komiňák
Browse files

Merge branch 'master' of https://gitlab.fi.muni.cz/xkominak/bakloska 

# Conflicts:
#	README.md
parents 930926aa aedc4e08
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