[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit 2073477e051e66afa6ce5c447b6ebc75dbe32636
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 2 13:34:01 2017 +0100

    Add EmojiOne Mozilla font

diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf
index f93157d..c515d7a 100644
--- a/conf.d/45-generic.conf
+++ b/conf.d/45-generic.conf
@@ -5,11 +5,11 @@
 
 <!-- Emoji -->
 	<alias binding="same">
-		<family>EmojiTwo</family>
+		<family>Emoji Two</family>
 		<default><family>emoji</family></default>
 	</alias>
 	<alias binding="same">
-		<family>EmojiOne</family>
+		<family>Emoji One</family>
 		<default><family>emoji</family></default>
 	</alias>
 	<alias binding="same">
@@ -29,6 +29,10 @@
 		<default><family>emoji</family></default>
 	</alias>
 	<alias binding="same">
+		<family>EmojiOne Mozilla</family> <!-- Mozilla -->
+		<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 2368e90..c70dd89 100644
--- a/conf.d/60-generic.conf
+++ b/conf.d/60-generic.conf
@@ -7,13 +7,14 @@
 	<alias binding="same">
 		<family>emoji</family>
 		<prefer>
-			<family>EmojiTwo</family>
-			<family>EmojiOne</family>
+			<family>Emoji Two</family>
+			<family>Emoji One</family>
 			<!-- System fonts -->
 			<family>Noto Color Emoji</family> <!-- Google -->
 			<family>Apple Color Emoji</family> <!-- Apple -->
 			<family>Segoe UI Emoji</family> <!-- Microsoft -->
 			<family>Twitter Color Emoji</family> <!-- Twitter -->
+			<family>EmojiOne Mozilla</family> <!-- Mozilla -->
 			<!-- Non-color -->
 			<family>Noto Emoji</family> <!-- Google -->
 			<family>Android Emoji</family> <!-- Google -->