diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2019-07-10 05:56:23 +0000 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2019-07-10 05:56:23 +0000 |
| commit | 2b03a0c2cf699074ec37a863e5c752a2cab2b133 (patch) | |
| tree | 7ebc289d2ec498fcebf8ae454cdb1eb1ef500dbd /package.json | |
| parent | c0deda7a86796c5de6ebe376c83f55af0965bde3 (diff) | |
| parent | 810df4fb51bf3db4016c5f7458599331d4586300 (diff) | |
| download | gitlab-ce-2b03a0c2cf699074ec37a863e5c752a2cab2b133.tar.gz | |
Merge branch 'master' into 'docs-hard-tabs'docs-hard-tabs
# Conflicts:
# doc/administration/pseudonymizer.md
# doc/administration/uploads.md
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 5b255f55e33..5955790488a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@babel/preset-env": "^7.4.4", "@gitlab/csslab": "^1.9.0", "@gitlab/svgs": "^1.67.0", - "@gitlab/ui": "^5.3.2", + "@gitlab/ui": "^5.5.0", "apollo-cache-inmemory": "^1.5.1", "apollo-client": "^2.5.1", "apollo-link": "^1.2.11", |