Skip to content
Commit 296c06d8 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

Making git aware of manual merge of 63ff1a9a 

Conflicts:
	core/src/main/java/hudson/tasks/MailSender.java
parents 733954ee 776008c8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment