diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-10 16:00:33 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-10 16:00:33 +0000 |
| commit | d77433a8ff87959d1e7bafd5aca093975106b891 (patch) | |
| tree | 18913b14f8bcec7adf57e8abb36c880f6ccb23f3 /package.json | |
| parent | f6e47f6f222380eead684ae8ba0ae522f7fcd789 (diff) | |
| parent | 0afcfd31bdf8d23bc180d5a36796aba8e66dbd33 (diff) | |
| download | gitlab-ce-d77433a8ff87959d1e7bafd5aca093975106b891.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/shared/runners/_form.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 596b7d019c6..04103ab4957 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "worker-loader": "^1.1.1" }, "devDependencies": { - "axios-mock-adapter": "^1.10.0", + "axios-mock-adapter": "^1.15.0", "babel-eslint": "^8.0.2", "babel-plugin-istanbul": "^4.1.6", "babel-plugin-rewire": "^1.1.0", |