phpbb/phpBB/language
Nathan Guse 0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-12-07 21:14:39 -06:00
..
en Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-12-07 21:14:39 -06:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00