phpbb/phpBB/language
Marc Alexander b17fc98043 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_team.html
2015-10-18 10:33:05 +02:00
..
en Merge branch '3.1.x' 2015-10-18 10:33:05 +02:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00