Commit ed7f6950 authored by nanahira's avatar nanahira

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

parents 9aeaa05d 4e8e35b9
Pipeline #4758 passed with stages
in 5 minutes and 5 seconds