Merge branch 'xorg/master' into xorg/f/xnet-accounts
[platal.git] / htdocs / .gitignore
1 /.htaccess
2 /uploads
3 /wiki