[gnome-initial-setup: 2/2] Merge branch 'jrocha/fix-setting-vendor-conf-file' into 'master'

[Will Thompson <wjt src gnome org>]

commit 97f2eb8b8ccbc42b10e62973d70d4c95a824fdb8
Merge: 3ec0561 9cceae0
Author: Will Thompson <will willthompson co uk>
Date:   Thu Aug 2 10:11:23 2018 +0000

    Merge branch 'jrocha/fix-setting-vendor-conf-file' into 'master'
    
    build: Fix setting the vendor conf file
    
    See merge request GNOME/gnome-initial-setup!12

 meson.build | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
---