Commit 02daae71 authored by John Ellson's avatar John Ellson

Merge branch 'revert-6dcb4f0a' into 'master'

Revert "Merge branch 'cairo-mime-data' into 'master'"

See merge request !1296
parents 2e179ee9 f9b7f421
Pipeline #37875026 passed with stages
in 23 minutes and 12 seconds