Commit 0db7d4c2 authored by nanahira's avatar nanahira

Merge branch 'mercury' of github.com:moecube/srvpro into mc

parents 7f576fd4 9365c21d
Pipeline #2836 passed with stages
in 9 minutes and 6 seconds