]> gitweb.pimeys.fr Git - config-20-100.git/commit - .bash_aliases
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)
commit824a2c74d770cb32f0735d1b83b31d24789130c6
tree80d956b449ebc32d904646d7229e6830449424fa
parent93ad74edb3c613f83fbc46cfff323fd7b0738f55
parent247a25e49cbe251cb67d53d9f636d1a704309837
Merge branch 'master' into perso

Conflicts:
.procmailrc
.procmailrc