Commit be6540b0 authored by Rieks Joosten's avatar Rieks Joosten

Merge branch 'terminology-rieks' into 'master'

Updates on Terminology (work-in-progress)

See merge request !6
parents cba2acbd 3c0051bc
Pipeline #15815 passed with stages
in 3 minutes and 4 seconds