Merge branch 'master' into perso

diff --cc .bashrc
index 77178337d2b3d44342af25c276ca9ed42b5288b8,057bd56631f163e84fe48979aae16c421439fcc7..6df39e266815f62d743ef9c9531987bf760fcd60
--- 1/.bashrc
--- 2/.bashrc
+++ b/.bashrc
@@@ -349,6 -355,11 +354,11 @@@ if [ -f ~/.bash_aliases_local ]; the
      . ~/.bash_aliases_local
  fi
  
+ 
+ # +-----+
+ # | End |
+ # +-----+
+ 
  # On n'exécute le welcome_message que à ce moment, parce que la customisation
 -# local a pu changer des couleurs
 +# locale a pu changer des couleurs
  welcome_message

diff --cc .ssh/config
Simple merge