summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorbikebilly <fabio@gitlab.com>2017-11-07 09:44:13 +0100
committerbikebilly <fabio@gitlab.com>2017-11-07 09:44:13 +0100
commita40bb17688f4d2983c22929cfbb1d888c2a6e68c (patch)
tree90d8c6d008affa2b774b6f2a958355a419283285 /locale
parentad9c0bae5f573fb14410d421247814673ea9e690 (diff)
parente99ddb6f374c9f79c1c78e808c5e9bd983bed227 (diff)
downloadgitlab-ce-a40bb17688f4d2983c22929cfbb1d888c2a6e68c.tar.gz
Resolve conflicts
Diffstat (limited to 'locale')
0 files changed, 0 insertions, 0 deletions