]> gitweb.pimeys.fr Git - config-20-100.git/commit - .bash_aliases
Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers...
authorVincent Le Gallic <legallic@crans.org>
Sun, 18 Aug 2013 11:13:22 +0000 (13:13 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sun, 18 Aug 2013 11:13:22 +0000 (13:13 +0200)
commit210eee338643d5734ab408ba2d2d2a004b469793
tree8528e12f3d5be9c6d0aeadd7fa99e925477a53d9
parent611906ce1639c4962d3d4c02f633b1210bea6dc2
parentfc7e6815d113198f0a545ed4b43c2169250464e3
Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso

Conflicts:
.procmail/rc/ML_perso
.procmailrc