diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-12 18:13:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 18:13:30 -0500 |
| commit | 5cff053944b4327477ca45882c9dd3b1a7a559e8 (patch) | |
| tree | 83c564879534ea35f468ce319342e011773f24aa /yarn.lock | |
| parent | 99b2bc2668e79bacd7f8696315206872086ebf3a (diff) | |
| parent | f6bb50b6ece555af138df164680189b1ec57da4b (diff) | |
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 4 |
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" |