about summary refs log tree commit diff
path: root/yarn.lock
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-16 20:59:33 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-16 20:59:33 +0100
commit4aa6aba6ee95ba37df7ca1d9c65f360b1b00ec04 (patch)
tree7c90513d2576dba9d71ac069ca28ac7e4db72a28 /yarn.lock
parent6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff)
parent735b8be2042a29fb10077aaab526832b95a041a9 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock9
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"