about summary refs log tree commit diff
path: root/yarn.lock
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-04-03 19:17:20 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-04-03 19:17:20 +0000
commit6611100480c86c07972c1223e7231c136966e11d (patch)
treed6ce7cf9568d13ba0dfc8ee32fd1335e0d053f43 /yarn.lock
parent1f5bdd8445f6ba192618288504b74c1df7c09ea6 (diff)
parentd8d42179590db772cc5b1873385cba7e5afe20df (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock4
1 files changed, 4 insertions, 0 deletions
diff --git a/yarn.lock b/yarn.lock
index 8ae8efbd2..e21df9cb4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2437,6 +2437,10 @@ eslint-plugin-jsx-a11y@^5.1.1:
     emoji-regex "^6.1.0"
     jsx-ast-utils "^1.4.0"
 
+eslint-plugin-promise@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.7.0.tgz#f4bde5c2c77cdd69557a8f69a24d1ad3cfc9e67e"
+
 eslint-plugin-react@^7.5.1:
   version "7.5.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz#52e56e8d80c810de158859ef07b880d2f56ee30b"