Commit a76d7465 authored by canterburym's avatar canterburym

Merge branch 'update_testing' into 'master'

Update testing

See merge request !21
parents 1b6cae88 e325dc36
Pipeline #4943 passed with stage
in 13 seconds