]> gitweb.pimeys.fr Git - config-20-100.git/commitdiff
Merge branch 'master' of ssh://git.crans.org/git/fichiers_configuration
authorValentin Samir <samir@crans.org>
Fri, 26 Jul 2013 22:48:06 +0000 (00:48 +0200)
committerValentin Samir <samir@crans.org>
Fri, 26 Jul 2013 22:48:06 +0000 (00:48 +0200)
1  2 
.bashrc

diff --cc .bashrc
Simple merge