diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-16 22:59:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 22:59:47 +0100 |
| commit | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (patch) | |
| tree | 239e6c3779ce64ee9833c3eec761ea158c2813b3 /yarn.lock | |
| parent | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff) | |
| parent | 8ea344fed40ae1dccf5e1b6ecfd0014128c10fb7 (diff) | |
Merge pull request #962 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/yarn.lock b/yarn.lock index 11fe49fa6..22f8abd48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3177,9 +3177,12 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -emoji-mart@Gargron/emoji-mart#build: - version "2.6.2" - resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9" +emoji-mart@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-2.10.0.tgz#e1adec430f4963f79055b12b80e6d60c5abb742d" + integrity sha512-VhcX463f8TDaQc1Tpc8rI31E15+8KXOYff1vwjokjMT52bZlCQCyq3zrnNScSYjv95f1+R4DMMreeuPvYFvOhg== + dependencies: + prop-types "^15.6.0" emoji-regex@^6.5.1: version "6.5.1" |