Merge remote-tracking branch 'origin/master'

[jirafeau.git] / .gitignore

lib/config.local.php
lib/tos.local.txt
var-*
*._*
/vendor