Skip to content
Commit 1980d38b authored by Zofia Tunova's avatar Zofia Tunova
Browse files

Merge branch 'development' into resources-test 

# Conflicts:
#	pom.xml
parents 67e0bed4 96d8150f
Pipeline #320371 passed with stages
in 5 minutes and 46 seconds
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