]> gitweb.pimeys.fr Git - config-20-100.git/commit - .bash_aliases
Merge branch 'master' into perso
authorVincent Le Gallic <legallic@crans.org>
Sat, 5 Apr 2014 21:44:16 +0000 (23:44 +0200)
committerVincent Le Gallic <legallic@crans.org>
Sat, 5 Apr 2014 21:44:16 +0000 (23:44 +0200)
commit39fae3a3633300d0f0bddb42e5c60533a3a1f113
tree82181fcd4f312a440dfafdeec91327eda9497b3a
parent89e2ce95a01dbc21865c91beebdf7c7647bfe74b
parent8a79d465b64299f6646b5e51fae82cf5ce0ffb1a
Merge branch 'master' into perso

Conflicts:
.bashrc
.bashrc