]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
projects / config-20-100.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6108b7b feb2595)
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)
Conflicts:
.ssh/config

1  2 
.ssh/config patch | diff1 | diff2 | blob | history

diff --cc .ssh/config
Simple merge
Branche perso de configuration de 20-100.