Commit 31502139 authored by aho's avatar aho
Browse files

Merge branch 'master' into 'production'

Merge 'master' into 'production'

See merge request !100
parents 981e80c3 1d08c922
Pipeline #7382 passed with stage
in 7 minutes and 19 seconds