about summary refs log tree commit diff
path: root/yarn.lock
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-06-12 18:12:29 -0500
committerGitHub <noreply@github.com>2018-06-12 18:12:29 -0500
commitf6bb50b6ece555af138df164680189b1ec57da4b (patch)
tree490c6054260f4a75fb0467f343124746c1935970 /yarn.lock
parent34f1fd2a621ca869c17009487e2f10063812fbd0 (diff)
parentfac6e392e9d76e3cca44ce142690a59afc0a9156 (diff)
Merge pull request #539 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/yarn.lock b/yarn.lock
index 4525ec2af..7e015ca42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2308,8 +2308,8 @@ elliptic@^6.0.0:
     minimalistic-crypto-utils "^1.0.0"
 
 emoji-mart@Gargron/emoji-mart#build:
-  version "2.1.4"
-  resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/a5e1afe5ebcf2841e611d20d261b029581cbe051"
+  version "2.6.2"
+  resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9"
 
 emoji-regex@^6.1.0:
   version "6.5.1"