[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 conf.d/45-generic.conf |    4 ++++
 conf.d/60-generic.conf |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 368fe08f970d7f8d3b49f1350ca14b0915a754b3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 2 13:04:36 2017 +0100

    Add Twitter Color Emoji
    
    https://bugs.freedesktop.org/show_bug.cgi?id=94551#c33

diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf
index d3f6277..f93157d 100644
--- a/conf.d/45-generic.conf
+++ b/conf.d/45-generic.conf
@@ -25,6 +25,10 @@
 		<default><family>emoji</family></default>
 	</alias>
 	<alias binding="same">
+		<family>Twitter Color Emoji</family> <!-- Twitter -->
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
 		<family>Noto Emoji</family> <!-- Google -->
 		<default><family>emoji</family></default>
 	</alias>
diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf
index 24b7466..2368e90 100644
--- a/conf.d/60-generic.conf
+++ b/conf.d/60-generic.conf
@@ -13,6 +13,7 @@
 			<family>Noto Color Emoji</family> <!-- Google -->
 			<family>Apple Color Emoji</family> <!-- Apple -->
 			<family>Segoe UI Emoji</family> <!-- Microsoft -->
+			<family>Twitter Color Emoji</family> <!-- Twitter -->
 			<!-- Non-color -->
 			<family>Noto Emoji</family> <!-- Google -->
 			<family>Android Emoji</family> <!-- Google -->