diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
| commit | 2409acfa7f97fef81dd66640c64e9d0008b85cde (patch) | |
| tree | 1dcafa5cd5b4646ddaf6d736cc2a15d60d0f0c19 /yarn.lock | |
| parent | 0f366c74131339cb45c8943437fe5b3e68721c75 (diff) | |
| parent | f277fa14094e5515e2317d2baa1fa0bfb95966da (diff) | |
| download | gitlab-ce-2409acfa7f97fef81dd66640c64e9d0008b85cde.tar.gz | |
Merge branch 'master' into 'group-sort-dropdown-blank'
# Conflicts:
# spec/features/dashboard/group_spec.rb
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yarn.lock b/yarn.lock index ae86887630b..57644482b32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2713,8 +2713,8 @@ getpass@^0.1.1: assert-plus "^1.0.0" "gitlab-svgs@https://gitlab.com/gitlab-org/gitlab-svgs.git": - version "1.0.2" - resolved "https://gitlab.com/gitlab-org/gitlab-svgs.git#e7621d7b028607ae9c69f8b496cd49b42fe607e4" + version "1.0.4" + resolved "https://gitlab.com/gitlab-org/gitlab-svgs.git#46c0a49cd43639948dfcc77a0f94d59deaad1e85" glob-base@^0.3.0: version "0.3.0" |