[gnome-initial-setup: 2/2] Merge branch 'mcatanzaro/vendor-conf' into 'master'

[Will Thompson <wjt src gnome org>]

commit 5b354e84f02d90aaa39a405806f19bd80edf296e
Merge: ee5cafc7 c7939ef0
Author: Will Thompson <will willthompson co uk>
Date:   Sun May 31 08:37:05 2020 +0000

    Merge branch 'mcatanzaro/vendor-conf' into 'master'
    
    create a search path for vendor.conf
    
    Closes #105
    
    See merge request GNOME/gnome-initial-setup!85

 gnome-initial-setup/gis-driver.c | 45 ++++++++++++++++++++++++++++++++--------
 meson.build                      | 14 +++++++------
 meson_options.txt                |  2 +-
 3 files changed, 45 insertions(+), 16 deletions(-)
---