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

[Sam Thursfield <sthursfield src gnome org>]

commit ff599b25b41a66b2a89e7b63269a788eff7b10ea
Merge: 913cedbb3 7f242a845
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Jun 19 13:19:24 2020 +0000

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

 src/libtracker-miner/tracker-decorator.c | 38 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)
---