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 /CONTRIBUTING.md | |
| 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 'CONTRIBUTING.md')
0 files changed, 0 insertions, 0 deletions