diff options
author | Ryan Harris <harrisryan1@gmail.com> | 2017-01-06 19:33:17 +0300 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-01-07 13:54:05 +0300 |
commit | a57597108fdc3d05a1996b2e09b1d0f56acc57fc (patch) | |
tree | 18e85d7eca504fe88508c1b2c16044f3d3d66384 /spec/views | |
parent | 8ab94120ee0a87c7b1158ebafea101e3952ec758 (diff) |
Resolved merge conflict in app/views/shared/milestones/_issuables.html.haml
Diffstat (limited to 'spec/views')
0 files changed, 0 insertions, 0 deletions