Merge commit 'origin/master' into fusionax
[platal.git] / htdocs / .gitignore
1 /.htaccess
2 /uploads
3 /wiki