]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Tue, 7 Jun 2016 01:05:35 +0000 (03:05 +0200)
committerVincent Le Gallic <legallic@crans.org>
Tue, 7 Jun 2016 01:05:35 +0000 (03:05 +0200)
Conflicts:
.ssh/config
.vimrc


No differences found