Commit c8ce5471 authored by nanahira's avatar nanahira

Merge branch 'master' of ../srvpro into develop

parents 6a797c2d 3ebed4d9
Pipeline #40328 passed with stages
in 11 minutes and 15 seconds