You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/02/29 00:26:03 UTC

[incubator-apisix-dashboard] 05/05: Merge branch 'master' of github.com:iresty/apisix_dashboard

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch feat-diff
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git

commit 24fc94b4fe4dcdf9051cb941dcfbaecf2130de64
Merge: 2795a4f c387358
Author: juzhiyuan <jj...@gmail.com>
AuthorDate: Sat Feb 29 08:25:32 2020 +0800

    Merge branch 'master' of github.com:iresty/apisix_dashboard

 yarn.lock | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --cc yarn.lock
index 6b64deb,a3a35f8..65b64a7
--- a/yarn.lock
+++ b/yarn.lock
@@@ -7545,6 -7668,14 +7559,13 @@@ readdirp@~3.3.0
    dependencies:
      picomatch "^2.0.7"
  
+ redent@^1.0.0:
+   version "1.0.0"
+   resolved "https://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+   integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
+   dependencies:
 -    indent-string "^2.1.0"
 -    strip-indent "^1.0.1"
++    picomatch "^2.0.7"
+ 
  regenerate-unicode-properties@^8.1.0:
    version "8.1.0"
    resolved "https://registry.npm.taobao.org/regenerate-unicode-properties/download/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"