diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-01-24 16:26:35 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-01-24 16:26:35 +0000 |
| commit | 8c0e358a972ca9cb2176ff9289a5a89b0c909a93 (patch) | |
| tree | 297d845b23c924077fa30a06ebb6d315fb6efd5e /app/models/environment.rb | |
| parent | c66c3a46b508954fef6de41441d5a30eb3083f85 (diff) | |
| parent | b72f43d053ff835726ad82cf9bab220c18209a89 (diff) | |
| download | gitlab-ce-8c0e358a972ca9cb2176ff9289a5a89b0c909a93.tar.gz | |
Merge branch 'docs/conflict-editor' into 'master'
Add docs for resolve conflicts editor
See merge request !8748
Diffstat (limited to 'app/models/environment.rb')
0 files changed, 0 insertions, 0 deletions