diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-09 17:04:05 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-09 17:04:05 +0000 |
commit | aa4942a2132652ccca52a583c78f7aa92ff7d256 (patch) | |
tree | bbc0b70bd2bec3d420c0c883a3ba0a03c7024fb1 /package.json | |
parent | 3ae87eef064b019ee7944595cb33741de8805d24 (diff) | |
parent | 91a3a4b526214f4174f4f12de23dfb5baf033211 (diff) | |
download | gitlab-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 'package.json')
-rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 1b17a91e83b..fcfa4efa991 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.16.0", + "@gitlab-org/gitlab-svgs": "^1.17.0", "autosize": "^4.0.0", "axios": "^0.17.1", "babel-core": "^6.26.0", |