Commit 82596784 authored by Riegel's avatar Riegel
Browse files

Merge branch 'refs/heads/dev' into dev_zip_files

# Conflicts:
#	CityDoctorParent/CityDoctorModel/pom.xml
#	CityDoctorParent/pom.xml
2 merge requests!28Version 3.17.0 Release,!26Add ZIP-archive support
Pipeline #10959 failed with stage
in 1 minute and 9 seconds