phpbb/phpBB/language
Andreas Fischer 1b3109d650 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php
2014-09-24 21:24:29 +02:00
..
en Merge branch 'develop-olympus' into develop-ascraeus 2014-09-24 21:24:29 +02:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00