Commit 92e245fb authored by Rieks Joosten's avatar Rieks Joosten
Browse files

Merge branch 'terminology-rieks' into 'master'

retry merge

See merge request !37
parents caecd7f1 4870812b
Pipeline #48815 passed with stage
in 1 minute and 51 seconds