about summary refs log tree commit diff
path: root/yarn.lock
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-06-12 13:17:21 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-06-12 13:17:21 +0000
commit4d8d1fa129b5f8692311de211203bc18c614951f (patch)
treee9a1130c9a9e5a5b8babd2ba3153e4ed03a4581e /yarn.lock
parent34f1fd2a621ca869c17009487e2f10063812fbd0 (diff)
parent6151308c47efb0e05bcb2c54aa1693f5ff04da5c (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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"