[glib/glib-2-68: 2/2] Merge branch 'backport-2078-threaded-resolver-flags-glib-2-68' into 'glib-2-68'

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

commit 942026a2ebf0ce295a1be64a15c1a942ec23ed2f
Merge: 5e0058198 9383b9a95
Author: Sebastian Dröge <slomo coaxion net>
Date:   Mon May 3 11:59:57 2021 +0000

    Merge branch 'backport-2078-threaded-resolver-flags-glib-2-68' into 'glib-2-68'
    
    Backport !2078 “gthreadedresolver: don't ignore flags in lookup_by_name_with_flags” to glib-2-68
    
    See merge request GNOME/glib!2079

 gio/gthreadedresolver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---