Commit 29c52f3a authored by nanahira's avatar nanahira

Merge branch 'master' into 'master'

Master

See merge request !2
parents b0dc4c10 79edf32a
Pipeline #2579 passed with stages
in 54 seconds