diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2018-02-08 11:50:54 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-02-08 11:50:54 +0000 |
commit | 920f71a03c4254db0e8a503ab49fbf9a7e8f5f6d (patch) | |
tree | 342dc089980d8ee09331a49df82a1b62246272a4 /doc/api/groups.md | |
parent | 07e1bcc0768d74b85135a2dff1d7cd3afd13f6de (diff) | |
parent | c807a79979fe7c6335c625fcd0eaa9fd5cb900b2 (diff) | |
download | gitlab-ce-920f71a03c4254db0e8a503ab49fbf9a7e8f5f6d.tar.gz |
Merge branch 'bvl-pot-merge-conflicts-docs' into 'master'
Add a note about merge conflicts in `gitlab.pot`
See merge request gitlab-org/gitlab-ce!16971
Diffstat (limited to 'doc/api/groups.md')
0 files changed, 0 insertions, 0 deletions