diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-28 22:35:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 22:35:54 +0200 |
| commit | 98c2d2aa46c2725b360907cf5537338ac6d052ed (patch) | |
| tree | 4b3301453fc3f8bcfe412a5e1bb967ec5c3414c6 /yarn.lock | |
| parent | f7c0e326ab11a597b17a22dd8889f0690d7ffd73 (diff) | |
| parent | 662252c8f77e8dd8fd015bc6ece0943f068b1710 (diff) | |
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 776473f77..a7d98fe3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3388,8 +3388,8 @@ elliptic@^6.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" + version "2.6.3" + resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf" emoji-regex@^7.0.1, emoji-regex@^7.0.2: version "7.0.3" |