summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-03-04 22:33:37 -0800
committerStan Hu <stanhu@gmail.com>2019-03-04 22:33:37 -0800
commit997290fcba1058650390645d099a7245510470b6 (patch)
tree82ee35b138ef9e8b7da6a7100ecc82743f8b4743 /CHANGELOG.md
parent0fc51747b78c7cb3b590f29354fc236bfcb847f4 (diff)
downloadgitlab-ce-997290fcba1058650390645d099a7245510470b6.tar.gz
Resolve conflicts in spec/mailers/notify_spec.rb
Diffstat (limited to 'CHANGELOG.md')
0 files changed, 0 insertions, 0 deletions