diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-30 10:26:50 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-30 10:26:50 +0000 |
| commit | f23130e5e6dfc008ef55f4ea2e22117a189ad532 (patch) | |
| tree | 9619e139d8808b2bf25d1225e022cac7c729c0ed /scripts/lint-conflicts.sh | |
| parent | 9bff69b6264382f7a9cbcbb351284c7e77810209 (diff) | |
| parent | 8c759580e1c2e0fd9259df85c8ab1da4d722f895 (diff) | |
| download | gitlab-ce-f23130e5e6dfc008ef55f4ea2e22117a189ad532.tar.gz | |
Merge branch 'doc_api_settings' into 'master'
Settings API: Sync documentation with implemented features
See merge request gitlab-org/gitlab-ce!30909
Diffstat (limited to 'scripts/lint-conflicts.sh')
0 files changed, 0 insertions, 0 deletions