]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers...
authorVincent Le Gallic <legallic@crans.org>
Fri, 15 Nov 2013 12:18:22 +0000 (13:18 +0100)
committerVincent Le Gallic <legallic@crans.org>
Fri, 15 Nov 2013 12:18:22 +0000 (13:18 +0100)
1  2 
.bashrc
.procmailrc

diff --cc .bashrc
Simple merge
diff --cc .procmailrc
Simple merge