diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-12-11 16:27:40 +0000 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-12-11 16:27:40 +0000 |
| commit | d9f40fddb704a60a38a95dd6433ff40ce65d738d (patch) | |
| tree | 6690f626e2a719923300d848e3ad09bf3cee3f68 /.haml-lint.yml | |
| parent | 3daa7331397d0b565911d5bb67b2411b021136fa (diff) | |
| parent | 40d404a6358a52eaee12feb5d43404de281d57ce (diff) | |
| download | gitlab-ce-d9f40fddb704a60a38a95dd6433ff40ce65d738d.tar.gz | |
Merge branch 'winh-merge-dev-docs' into 'master'
Resolve merge conflicts with dev.gitlab.org/master after security release
See merge request gitlab-org/gitlab-ce!15851
Diffstat (limited to '.haml-lint.yml')
0 files changed, 0 insertions, 0 deletions