[glib/glib-2-64: 2/2] Merge branch 'backport-1442-gfile-content-type-glib-2-64' into 'glib-2-64'

[Sebastian Dröge <sdroege src gnome org>]

commit 6bebadace66f86ec6e37dcc5eb777e2f3035cdfd
Merge: 204b4dc28 35953b537
Author: Sebastian Dröge <slomo coaxion net>
Date:   Thu Apr 9 13:16:38 2020 +0000

    Merge branch 'backport-1442-gfile-content-type-glib-2-64' into 'glib-2-64'
    
    Backport !1442 “gfile: Fallback to fast-content-type if content-type is not set” to glib-2-64
    
    See merge request GNOME/glib!1447

 gio/gfile.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---