summaryrefslogtreecommitdiff
path: root/yarn.lock
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-04-09 17:04:05 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-04-09 17:04:05 +0000
commitaa4942a2132652ccca52a583c78f7aa92ff7d256 (patch)
treebbc0b70bd2bec3d420c0c883a3ba0a03c7024fb1 /yarn.lock
parent3ae87eef064b019ee7944595cb33741de8805d24 (diff)
parent91a3a4b526214f4174f4f12de23dfb5baf033211 (diff)
downloadgitlab-ce-aa4942a2132652ccca52a583c78f7aa92ff7d256.tar.gz
Merge branch 'master' into 'bootstrap4'
# Conflicts: # app/helpers/issuables_helper.rb # app/views/projects/_home_panel.html.haml # app/views/projects/commits/_commit.html.haml
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/yarn.lock b/yarn.lock
index cadc9b8118a..dfa98d0cad1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -54,9 +54,9 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
-"@gitlab-org/gitlab-svgs@^1.16.0":
- version "1.16.0"
- resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.16.0.tgz#6c88a1bd9f5b3d3e5bf6a6d89d61724022185667"
+"@gitlab-org/gitlab-svgs@^1.17.0":
+ version "1.17.0"
+ resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.17.0.tgz#d0c74d9e44c127ccfad16941f352088b86f86c89"
"@types/jquery@^2.0.40":
version "2.0.48"