]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Thu, 3 Mar 2016 01:27:27 +0000 (02:27 +0100)
committerVincent Le Gallic <legallic@crans.org>
Thu, 3 Mar 2016 01:27:27 +0000 (02:27 +0100)
Conflicts:
.procmailrc

1  2 
.procmailrc

diff --cc .procmailrc
Simple merge