[tracker-miners: 2/2] Merge branch 'sam/core-subproject-option' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit fbd5f4830d8cd7e8badb9c7e463b4c8dcfb925e4
Merge: 025c97766 3e46f52f2
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Aug 16 14:00:09 2018 +0000

    Merge branch 'sam/core-subproject-option' into 'master'
    
    meson: Turn core-as-subproject into an explicit option
    
    See merge request GNOME/tracker-miners!18

 .gitlab-ci.yml    |  2 +-
 meson.build       | 45 +++++++++++++++++++++++++--------------------
 meson_options.txt |  3 +++
 3 files changed, 29 insertions(+), 21 deletions(-)
---