app*
content/robots.txt
<<<<<<< HEAD
custom/smtp-config.php*
.htaccess*
=======
custom/smtp-config.php
content/.htaccess
>>>>>>> 6034ab6b59a6fed575a2b98cfb044b75a481ba0d