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

[Sam Thursfield <sthursfield src gnome org>]

commit 3edf61678824e3cda031ed77eb2e3941d59f1a98
Merge: b4b447dba 9faf823d7
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Jul 11 18:33:30 2020 +0000

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

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