From 368fe08f970d7f8d3b49f1350ca14b0915a754b3 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 2 Aug 2017 13:04:36 +0100
Subject: Add Twitter Color Emoji

https://bugs.freedesktop.org/show_bug.cgi?id=94551#c33
---
 conf.d/45-generic.conf | 4 ++++
 conf.d/60-generic.conf | 1 +
 2 files changed, 5 insertions(+)

(limited to 'conf.d')

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
@@ -24,6 +24,10 @@
 		<family>Segoe UI Emoji</family> <!-- Microsoft -->
 		<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>
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 -->
-- 
cgit v1.2.1