diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-03 08:04:40 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-03 08:04:40 +0000 |
| commit | 16a935f28f5d9a69d0cd310d1ef035d82ee4b575 (patch) | |
| tree | c9db1bfa804dcabfe28dc6993bd57b92afa63b6e /package.json | |
| parent | dfe2fabfe79d30c160b4374611c5bccb83f272fd (diff) | |
| parent | c14927dcd1568c33c3ae4cc846eff12fc4aa362a (diff) | |
| download | gitlab-ce-16a935f28f5d9a69d0cd310d1ef035d82ee4b575.tar.gz | |
Merge branch 'leipert-resolve-fe-dependency-conflict-ce' into 'master'
Resolve CE/EE difference in FE dependency files
See merge request gitlab-org/gitlab-ce!26856
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package.json b/package.json index 29a3b3d0459..934a30df261 100644 --- a/package.json +++ b/package.json @@ -56,11 +56,13 @@ "d3-array": "^1.2.1", "d3-axis": "^1.0.8", "d3-brush": "^1.0.4", + "d3-ease": "^1.0.3", "d3-scale": "^1.0.7", "d3-selection": "^1.2.0", "d3-shape": "^1.2.0", "d3-time": "^1.0.8", "d3-time-format": "^2.1.1", + "d3-transition": "^1.1.1", "dateformat": "^3.0.3", "deckar01-task_list": "^2.2.0", "diff": "^3.4.0", |