]> 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>
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)
commit2f8ffc274b765dcc8d1968745a6a412001ab3fcc
treef850de3fcfc02e5cfe6e95d7fcbd944b80ce0980
parent0f351659b30daf7318dc3e65526f2669e0652a8d
parent7a7514f8e57c270e8e79eef2f5f31383cd53686f
Merge branch 'master' into perso

Conflicts:
.bash_aliases
.procmailrc