[glib: 3/3] Merge branch '2194-winhttp-file-display-name' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit c3eda78adaa770ade8343404dd66e82b9c02c235
Merge: b7c75f78a 9d859f001
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Sep 11 09:49:04 2020 +0000

    Merge branch '2194-winhttp-file-display-name' into 'master'
    
    gwinhttpfile: Set display-name attribute on file info
    
    Closes #2194
    
    See merge request GNOME/glib!1644

 gio/win32/gwinhttpfile.c | 24 ++++++++++++++++++++++++
 glib/gutf8.c             |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
---