[glib: 3/3] Merge branch 'wip/iainl/fix-1934' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 0a469dafe41e4014c56c9d681165da0e9984391c
Merge: 9dc006cfc 0c88825a7
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Nov 21 11:27:20 2019 +0000

    Merge branch 'wip/iainl/fix-1934' into 'master'
    
    Revert "glocalfileinfo: Only return file mode, not type, as UNIX_MODE attribute"
    
    Closes #1934
    
    See merge request GNOME/glib!1241

 gio/glocalfileinfo.c | 2 +-
 gio/tests/file.c     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---