Merge branch 'xorg/1.0.2/master'
[platal.git] / htdocs / .gitignore
1 /.htaccess
2 /uploads
3 /wiki