]> gitweb.pimeys.fr Git - config-20-100.git/commit - .procmail/rc/custom.normal.rules
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Tue, 7 Jun 2016 01:05:35 +0000 (03:05 +0200)
committerVincent Le Gallic <legallic@crans.org>
Tue, 7 Jun 2016 01:05:35 +0000 (03:05 +0200)
commit0a492655b7e30ab9949bbfe0d76955fa125eecba
treeae99d50efa41924e0320b011fb224a33c73d5c85
parentabb200aab6a1c1c2f41ca603c902f381c2eca725
parent076380e2f144a7e77c79f303da54c53b83072361
Merge branch 'master' into perso

Conflicts:
.ssh/config
.vimrc
.bashrc
.procmailrc
.ssh/config
.vimrc