diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-06-08 19:48:47 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-06-08 19:48:47 +0300 |
| commit | b32f3685aee483a06558d181c4ec72bfb255a007 (patch) | |
| tree | 840e0e11787282f8cc1c7cc8a195b01e5e7db29f /app/assets/javascripts/merge_conflicts | |
| parent | 0abd8578dde34e9e2b7ff4ccda746db93a2930ee (diff) | |
| parent | 7fac5c8df121cc6e64af02ed8337ce1813229ec3 (diff) | |
Merge branch '47532-follow-up-from-resolve-add-deploy-strategies-to-auto-devops-settings' into 'master'
Resolve "Follow-up from "Resolve "Add deploy strategies to Auto DevOps settings"""
Closes #47532
See merge request gitlab-org/gitlab-ce!19554
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
0 files changed, 0 insertions, 0 deletions