]> gitweb.pimeys.fr Git - config-20-100.git/commit - .procmail/rc/custom.high.rules
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Mon, 8 Sep 2014 15:27:29 +0000 (17:27 +0200)
committerVincent Le Gallic <legallic@crans.org>
Mon, 8 Sep 2014 15:27:29 +0000 (17:27 +0200)
commite9501d9938fe85bf705177a7fa542c355a69c649
treee988619c1a49c6f7513616fd446c4331d39904db
parent01196688c7f5ec257b18c5c7133485c25ce76451
parentd4b973619e3b8fb1775be8a6dd8572a45ea4f8e2
Merge branch 'master' into perso

Conflicts:
.ssh/config

Au passage j'ai virĂ© les machines d'ulm
.bashrc
.ssh/config