Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/smtpd/qpsmtpd
Browse files Browse the repository at this point in the history 
Conflicts:
	Changes
  • Loading branch information
@msimerson
msimerson committed Jan 9, 2014
2 parents 3353578 + f78da4b commit 8952644
Showing 1 changed file with 0 additions and 26 deletions.
26 changes: 0 additions & 26 deletions UPGRADING
View file

This file was deleted.

0 comments on commit 8952644

Please sign in to comment.