Skip to content
Commit 02a7232e authored by Michal Schejbal's avatar Michal Schejbal
Browse files

Merge branch 'master' of gitlab.fi.muni.cz:irtis/irtis-repository 

# Conflicts:
#	src/main/java/cz/muni/irtis/repository/database/identity/PersonEntity.java
parents 0cf0d8b6 139502cd
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