[glib: 2/2] Merge branch 'wip/oholy/fast-content-type' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit de8708cd9595269f4b27b6906a60de657ee0bef5
Merge: fa76bde25 461052f66
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Apr 14 15:48:43 2020 +0000

    Merge branch 'wip/oholy/fast-content-type' into 'master'
    
    gfile: Fallback to fast-content-type if content-type is not set
    
    See merge request GNOME/glib!1442

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