Skip to content
Snippets Groups Projects
Commit 9e1daf56 authored by Pietro Cavassin's avatar Pietro Cavassin
Browse files

Merge branch 'homologa' into 'dev' 

# Conflicts:
#   src/libs/convert/upperTurn.js
parents 552a6306 6f9471a3
No related branches found
No related tags found
3 merge requests!329Update enrollment - new filters,!324Dev,!309Merge new updates into master
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