phpbb/phpBB/language
Nils Adermann 5361a14c1e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
	phpBB/language/en/ucp.php
2013-02-24 17:42:14 +01:00
..
en Merge branch 'develop-olympus' into develop 2013-02-24 17:42:14 +01:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00