Commit 3044defe authored by Simone Vuotto's avatar Simone Vuotto

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/version.properties
parents eb0da15c e5ffa2e6
Pipeline #216 passed with stages
in 3 minutes and 19 seconds