]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
projects / config-20-100.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93ad74e 247a25e)
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 patch | diff1 | diff2 | blob | history

diff --cc .procmailrc
Simple merge
Branche perso de configuration de 20-100.