Skip to content
Snippets Groups Projects
Commit 74cebd5f authored by Mário Murín's avatar Mário Murín
Browse files

Merge branch 'master' into 78-remove-id-from-title-of-trainingdefinitioninfomapper

# Conflicts:
#	VERSION.txt
parents 365b3ab7 ffb0a8ad
No related branches found
No related tags found
No related merge requests found
Showing
with 30 additions and 16 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment