summaryrefslogtreecommitdiffstats
path: root/toolkit/content
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-04 10:35:19 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-04 10:35:19 +0200
commitb4e843aa3c58105a69f6473350da60fe4d49438c (patch)
tree7fbac6300e0768181fee2d6bc5a0d7d6de15ccf8 /toolkit/content
parent3cf6d2b2d73b3b09fb268a2b3927d920883745fb (diff)
downloadUXP-b4e843aa3c58105a69f6473350da60fe4d49438c.tar
UXP-b4e843aa3c58105a69f6473350da60fe4d49438c.tar.gz
UXP-b4e843aa3c58105a69f6473350da60fe4d49438c.tar.lz
UXP-b4e843aa3c58105a69f6473350da60fe4d49438c.tar.xz
UXP-b4e843aa3c58105a69f6473350da60fe4d49438c.zip
Change embedded emoji font from EmojiOne to Twemoji.
Diffstat (limited to 'toolkit/content')
-rw-r--r--toolkit/content/license.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 99ee42fde..45889a191 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -87,7 +87,7 @@
<li><a href="about:license#dtoa">dtoa License</a></li>
<li><a href="about:license#hunspell-nl">Dutch Spellchecking Dictionary License</a></li>
#if defined(XP_WIN) || defined(XP_LINUX)
- <li><a href="about:license#emojione">EmojiOne License</a></li>
+ <li><a href="about:license#twemoji">Twemoji License</a></li>
#endif
<li><a href="about:license#hunspell-ee">Estonian Spellchecking Dictionary License</a></li>
<li><a href="about:license#expat">Expat License</a></li>
@@ -2911,14 +2911,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<hr>
#if defined(XP_WIN) || defined(XP_LINUX)
- <h1><a id="emojione"></a>EmojiOne License</h1>
+ <h1><a id="twemoji"></a>Twemoji License</h1>
<p>This license applies to the emoji art contained within the bundled
emoji font file.</p>
<pre>
-Copyright (c) 2016 Ranks.com Inc.
-Copyright (c) 2014 Twitter, Inc and other contributors.
+Copyright (c) 2018 Twitter, Inc and other contributors.
Creative Commons Attribution 4.0 International (CC BY 4.0)