[dconf: 2/2] Merge branch 'fix/build-gtk-doc' into 'master'

[Daniel Playfair Cal <danielplayfaircal src gnome org>]

commit 060b9a177e7c128a52c2ba018feb891f4df94e32
Merge: 923096a 79487f7
Author: Daniel Playfair Cal <daniel playfair cal gmail com>
Date:   Mon Aug 13 23:46:06 2018 +0000

    Merge branch 'fix/build-gtk-doc' into 'master'
    
    Build: revert to the old "enable-gtk-doc" flag since there is no reason to change it
    
    See merge request GNOME/dconf!18

 .gitlab-ci.yml    | 6 +++---
 docs/meson.build  | 2 +-
 meson_options.txt | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---