diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 18:05:01 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 18:05:01 +0300 |
| commit | 6384aedace16fff336ff2a29d526ad8fcdfc2b84 (patch) | |
| tree | f8699aff6fb0d4e1a646d76ff2720520cd7c0652 /yarn.lock | |
| parent | b3d8b85f6520c8f89690a8f0e3ab96f5e6740cb2 (diff) | |
| parent | 5d6fb753ef3288c3da7e63470b7acd3694d86137 (diff) | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/admin/application_settings/_signin.html.haml
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yarn.lock b/yarn.lock index fde06adf67e..f35d625762c 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.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.17.0.tgz#d0c74d9e44c127ccfad16941f352088b86f86c89" +"@gitlab-org/gitlab-svgs@^1.18.0": + version "1.18.0" + resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.18.0.tgz#7829f0e6de0647dace54c1fcd597ee3424afb233" "@types/jquery@^2.0.40": version "2.0.48" |