]> gitweb.pimeys.fr Git - config-20-100.git/commit
Merge branch 'perso' into taf
authorVincent Le Gallic <legallic@enst.fr>
Thu, 6 Apr 2017 10:25:03 +0000 (12:25 +0200)
committerVincent Le Gallic <legallic@crans.org>
Thu, 6 Apr 2017 10:25:03 +0000 (12:25 +0200)
commitf80f2b82c700a8f81f3c72738788c800b0eb71dd
tree834130be73c87e6585b79145696a6583866482a7
parente15efbb71699fd8bc9b585f00478a7e177510c2a
parent2d71b2b0e0691b97fef5052e0a62d61af40ea0cf
Merge branch 'perso' into taf

Conflicts:
.ssh/config
.ssh/config