Commit 4af1dc3f authored by Scott Petrovic's avatar Scott Petrovic

Merge branch 'master' into 'master'

fix minor typo

See merge request !35
parents 1636b02e d9368bcf
Pipeline #2536 passed with stage
in 13 minutes and 43 seconds