summaryrefslogtreecommitdiff
path: root/locale/gitlab.pot
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-06-15 20:43:52 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-06-15 20:43:52 +0000
commit999926075d82552f630d4e9d8b1128f5f2e131af (patch)
tree77ac2291d3edbcbc4e58e0cd9e65c700266b3708 /locale/gitlab.pot
parentcbcf2fdddc4f73747631a417ac44534bda47344e (diff)
parent699b0e57e9b27410aa3df854bbde47d1fc85c9fd (diff)
downloadgitlab-ce-999926075d82552f630d4e9d8b1128f5f2e131af.tar.gz
Merge branch '9-3-stable-rc3-conflicts-docs' into '9-3-stable-rc3'
Resolve "Add docs for personal access tokens" conflicts See merge request !12194
Diffstat (limited to 'locale/gitlab.pot')
0 files changed, 0 insertions, 0 deletions