Commit 683897fc authored by Rieks Joosten's avatar Rieks Joosten

Merge branch 'terminology-rieks' into 'master'

updates on framework

See merge request !7
parents be6540b0 b6b794a1
Pipeline #16239 passed with stages
in 4 minutes and 2 seconds