[tracker-miners/tracker-miners-2.3: 2/2] Merge branch 'sam/tracker-miners-2.3-blocklist' into 'tracker-miners-2.3'

[Sam Thursfield <sthursfield src gnome org>]

commit 91357d0431769d0f76562be45acf106525d47c17
Merge: e840de737 4e37121fc
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Jun 21 09:39:37 2020 +0000

    Merge branch 'sam/tracker-miners-2.3-blocklist' into 'tracker-miners-2.3'
    
    Use 'blocklist' instead of 'blacklist'
    
    See merge request GNOME/tracker-miners!213

 data/org.freedesktop.Tracker.Miner.Files.gschema.xml | 2 +-
 src/tracker-extract/tracker-extract-gstreamer.c      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---