[gtk/gtk-3-24: 2/2] Merge branch 'gtk-3-24' into 'gtk-3-24'

[Matthias Clasen <matthiasc src gnome org>]

commit 7360d470c9b0078adaa0a0d04a08cad279aec85d
Merge: dea11781a5 73737bcc4f
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Apr 13 15:27:40 2020 +0000

    Merge branch 'gtk-3-24' into 'gtk-3-24'
    
    Remove the blacklist list in convert-emoji.c since now it is supported
    
    See merge request GNOME/gtk!1681

 gtk/emoji/convert-emoji.c |  41 -----------------------------------------
 gtk/emoji/emoji.data      | Bin 53533 -> 55307 bytes
 2 files changed, 41 deletions(-)
---