diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 15:05:01 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 15:05:01 +0000 |
| commit | 6384aedace16fff336ff2a29d526ad8fcdfc2b84 (patch) | |
| tree | f8699aff6fb0d4e1a646d76ff2720520cd7c0652 /package.json | |
| parent | b3d8b85f6520c8f89690a8f0e3ab96f5e6740cb2 (diff) | |
| parent | 5d6fb753ef3288c3da7e63470b7acd3694d86137 (diff) | |
| download | gitlab-ce-6384aedace16fff336ff2a29d526ad8fcdfc2b84.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/admin/application_settings/_signin.html.haml
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 f6907e1fd16..4a71a9cb409 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, "dependencies": { - "@gitlab-org/gitlab-svgs": "^1.17.0", + "@gitlab-org/gitlab-svgs": "^1.18.0", "autosize": "^4.0.0", "axios": "^0.17.1", "babel-core": "^6.26.0", |