summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-04-23 00:46:34 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-04-23 00:46:34 +0200
commitd03943a9eea748909a65838f2f9d4d99951d9747 (patch)
tree51c41f313c9d67786abb9890d883056c740b034e
parentab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14 (diff)
parent7d61305b0f4415db66762ccc5ba758e2996dda63 (diff)
downloadUXP-d03943a9eea748909a65838f2f9d4d99951d9747.tar
UXP-d03943a9eea748909a65838f2f9d4d99951d9747.tar.gz
UXP-d03943a9eea748909a65838f2f9d4d99951d9747.tar.lz
UXP-d03943a9eea748909a65838f2f9d4d99951d9747.tar.xz
UXP-d03943a9eea748909a65838f2f9d4d99951d9747.zip
Merge branch 'master' into Pale_Moon-release
-rw-r--r--application/basilisk/fonts/TwemojiMozilla.ttfbin1057104 -> 1158828 bytes
-rw-r--r--application/palemoon/fonts/TwemojiMozilla.ttfbin1075912 -> 1158828 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/application/basilisk/fonts/TwemojiMozilla.ttf b/application/basilisk/fonts/TwemojiMozilla.ttf
index 1933891d9..c47cbbf11 100644
--- a/application/basilisk/fonts/TwemojiMozilla.ttf
+++ b/application/basilisk/fonts/TwemojiMozilla.ttf
Binary files differ
diff --git a/application/palemoon/fonts/TwemojiMozilla.ttf b/application/palemoon/fonts/TwemojiMozilla.ttf
index 8139089f1..c47cbbf11 100644
--- a/application/palemoon/fonts/TwemojiMozilla.ttf
+++ b/application/palemoon/fonts/TwemojiMozilla.ttf
Binary files differ