]> gitweb.pimeys.fr Git - config-20-100.git/commit - .bash_aliases
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Tue, 7 Jun 2016 01:26:30 +0000 (03:26 +0200)
committerVincent Le Gallic <legallic@crans.org>
Tue, 7 Jun 2016 01:26:30 +0000 (03:26 +0200)
commit9a2de0d3ca9e4adfe1edaff417f7e9febccd95a4
treed46031cd5f617bd0a8321785d39e8c177a5d1f19
parent54de0953f49ddb0b5c0e42244b7b58c5ba7e3f5d
parent8b5e64120e5d33e5d4aefee9951d70b6a10f37c8
Merge branch 'master' into perso

Conflicts:
.ssh/config
.ssh/config