Skip to content

G
gitlab-ce
Commit f8a96a0a authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in locale/gitlab.pot 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 97e580e1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 66 deletions
locale/gitlab.pot
View file @ f8a96a0a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7