[gnome-initial-setup: 4/4] Merge branch 'wjt/vendor-conf-path-option' into 'master'

[Michael Catanzaro <mcatanzaro src gnome org>]

commit be2f3b6e35963bb0f76f8c5a61560ecc204dd708
Merge: 95059260 bd356779
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Jun 16 16:24:50 2020 +0000

    Merge branch 'wjt/vendor-conf-path-option' into 'master'
    
    Fix build with -Dvendor-conf-path
    
    See merge request GNOME/gnome-initial-setup!88

 .gitlab-ci.yml                   |  4 ++++
 gnome-initial-setup/gis-driver.c | 41 ++++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 21 deletions(-)
---