]> gitweb.pimeys.fr Git - config-20-100.git/commit - .procmail/rc/custom.high.rules
projects / config-20-100.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a80fb8 21282ec)
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 11 Apr 2015 14:44:18 +0000 (16:44 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 11 Apr 2015 14:44:18 +0000 (16:44 +0200)
commit8d82e5abd09ae7b42c42f30d316a412c54bbcf7f
treee758b9f683ef5ac692454de1b2a404fe9c5768e9tree | snapshot
parent4a80fb8ef186498aa5ca6e19ce5a33110c6eb1b4commit | diff
parent21282ec5b98f30b29607f02c61c823d605619897commit | diff
Merge branch 'master' into perso

Conflicts:
.ssh/config
.ssh/config diff1 | diff2 | blob | history
Branche perso de configuration de 20-100.