Commit 7dd9dd48 authored by spf's avatar spf

Merge branch 'ring' into 'master'

ring devient Jami

See merge request !129
parents 4dc6a1f9 095d54c9
Pipeline #102982 failed with stage
in 2 minutes and 55 seconds