[glib: 6/6] Merge branch 'meson-doc-ci' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit fde68be4b79b9a62cf4bd6d41d4ec236662c8e49
Merge: c5321810f ed8c74461
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Jul 6 12:22:24 2018 +0000

    Merge branch 'meson-doc-ci' into 'master'
    
    ci: Fix dist-job missing gobject/gio documentation
    
    See merge request GNOME/glib!123

 .gitlab-ci.yml                    |  6 ++--
 .gitlab-ci/Dockerfile             |  2 +-
 .gitlab-ci/run-docker.sh          |  2 +-
 .gitlab-ci/test-msvc.bat          |  1 +
 .gitlab-ci/test-msys2.sh          |  2 +-
 gio/fam/meson.build               | 62 +++++++++++++++++++--------------------
 gio/gdbus-2.0/codegen/meson.build |  3 +-
 gio/tests/meson.build             |  2 +-
 meson.build                       |  2 +-
 9 files changed, 41 insertions(+), 41 deletions(-)
---