]> gitweb.pimeys.fr Git - config-20-100.git/commit
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Mon, 23 Nov 2015 00:44:22 +0000 (01:44 +0100)
committerVincent Le Gallic <legallic@crans.org>
Mon, 23 Nov 2015 00:44:22 +0000 (01:44 +0100)
commitf886ab6eaf7791beb0d1070c3ac5a34dab2e0c49
tree8aa91039a2bfd05b898e4a21a6a5d4559d23c379
parent6108b7b34406f2ad59e45dcbd82d5410feb7522c
parentfeb2595830f694bbe4aaeabbfbfbf09bdff16274
Merge branch 'master' into perso

Conflicts:
.ssh/config
.ssh/config