phpbb/phpBB/language
Andreas Fischer 8b8c25194a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12540] Fix broken placeholders in language files

Conflicts:
	phpBB/language/en/common.php
	phpBB/language/en/posting.php
	phpBB/language/en/ucp.php
2014-05-15 13:41:54 +02:00
..
en Merge branch 'develop-olympus' into develop-ascraeus 2014-05-15 13:41:54 +02:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00