Skip to content
Commit de2b80ff authored by cdanger's avatar cdanger
Browse files

Merge branch 'release/8.1.0' into develop 

# Conflicts:
#	dist/pom.xml
#	pom.xml
#	rest-service/pom.xml
#	upgrader/pom.xml
#	webapp/pom.xml
parents d44b0f20 c56c774b
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