Skip to content
Commit 2958ebae authored by xmammad1's avatar xmammad1
Browse files

Merge branch 'baseEntity' of https://gitlab.fi.muni.cz/xforman2/pv179-project into baseEntity

parents 5443b2ac ccb84db1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment