diff options
| author | stevejenkins <steve@stevejenkins.com> | 2015-03-25 11:18:49 -0700 |
|---|---|---|
| committer | stevejenkins <steve@stevejenkins.com> | 2015-03-25 11:18:49 -0700 |
| commit | ed2564afe1b0e2903ecd7bdc9c22268fc2d88e9f (patch) | |
| tree | 5de18721b830a39b8ba5f4b1205ef56b6c48e845 /.gitignore | |
| parent | d43f39f2beca184cca9445ad48ab36c0cfc316bc (diff) | |
| parent | 9fbad3f10bd2dd4140fe9b16391208238dce5430 (diff) | |
| download | opendkim_EL6-ed2564afe1b0e2903ecd7bdc9c22268fc2d88e9f.tar.gz | |
Merge remote-tracking branch 'origin/master' into el5
Conflicts:
.gitignore
opendkim.spec
sources
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -11,6 +11,10 @@ /opendkim-2.8.3.tar.gz /opendkim-2.8.4.tar.gz /opendkim-2.9.0.tar.gz +<<<<<<< HEAD +======= +/opendkim.add-user-group.patch +>>>>>>> origin/master /opendkim-2.9.2.tar.gz /opendkim.autocreate-keys-no.patch /opendkim.keygen-permissions.patch |