1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 07:35:29 +02:00
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
..