]> 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: 0f35165 7a7514f)
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Thu, 24 Dec 2015 21:01:37 +0000 (22:01 +0100)
committerVincent Le Gallic <legallic@crans.org>
Thu, 24 Dec 2015 21:01:37 +0000 (22:01 +0100)
Conflicts:
.bash_aliases

1  2 
.procmailrc patch | diff1 | diff2 | blob | history

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