summaryrefslogtreecommitdiff
path: root/locale/en
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-04-12 21:42:44 +0000
committerDouwe Maan <douwe@gitlab.com>2017-04-12 21:42:44 +0000
commit2bc9a14f687a67b62e3ba972402d92603a59f82b (patch)
tree3a1cc5998f7e7502bf3f01e71a284a7d54d737da /locale/en
parent3e19ecae1774f4bbe234c54b0b41c25c78021813 (diff)
parent58cd4c48e639ab0ead5d1e1da4677c4b8e05233f (diff)
downloadgitlab-ce-2bc9a14f687a67b62e3ba972402d92603a59f82b.tar.gz
Merge branch 'rs-fix-already-defined-constant' into 'master'
Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error See merge request !10664
Diffstat (limited to 'locale/en')
0 files changed, 0 insertions, 0 deletions