summaryrefslogtreecommitdiff
path: root/log
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-15 22:34:48 +0200
committerClement Ho <ClemMakesApps@gmail.com>2017-06-19 09:41:36 -0500
commit10c9601265209f4d035bd3bf6bc6703f0c5995a6 (patch)
tree366dc2ff90f82c5385bf57ad49a9fe9cbbe4e226 /log
parent188abebbe494b9b2f136749fc4fdc61c3d5370de (diff)
downloadgitlab-ce-10c9601265209f4d035bd3bf6bc6703f0c5995a6.tar.gz
Resolve conflicts in job entity specs
Diffstat (limited to 'log')
0 files changed, 0 insertions, 0 deletions