diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-04-26 13:06:06 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-04-26 13:06:06 +0200 |
| commit | 52bd4b88dc557f0b3c63e82d0f2093f22b28ae9d (patch) | |
| tree | 485f4cd552277257a265ddb2880db36ee8a11126 /package.json | |
| parent | 0eca206c117c0f3cc50dfa6ce06d5dd96e446803 (diff) | |
| parent | e780473d4e075b75bb25cd7606ee866827d2c481 (diff) | |
| download | gitlab-ce-52bd4b88dc557f0b3c63e82d0f2093f22b28ae9d.tar.gz | |
Merge branch 'blackst0ne/gitlab-ce-add_index_on_ci_builds_user_id'
This manually merges https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10874
into master after resolving conflicts.
Diffstat (limited to 'package.json')
0 files changed, 0 insertions, 0 deletions