Commit ec3bffa6 authored by Riegel's avatar Riegel
Browse files

Merge branch 'master' into 'dev'

Update dev

See merge request !9
2 merge requests!11CityDoctor Release Version 3.16.0,!9Update dev
Pipeline #10276 passed with stage
in 1 minute and 5 seconds