Conflicts: .gitignore docs/docs.txt functions.php index.php xsaf3.php
WARNING: You really need to take a look at https://github.com/mitsukarenai/Projet-Autoblog/wiki/Mettre-%C3%A0-jour before updating