Commit 6c491b20 authored by kaniini's avatar kaniini

Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request !1399
parents 4016341a 347a1823
Pipeline #14546 skipped