Commit 5d6ad0fc authored by Michael Aaron Murphy's avatar Michael Aaron Murphy

Merge branch 're-add-or-test' into 'master'

Comment in test for 'or' since it now works.

See merge request !882
parents 483e51bd 0dc705f4
Pipeline #2114 passed with stage
in 7 minutes and 22 seconds