phpbb/phpBB/language
Oleg Pudeyev 03d3f9adb5 Merge PR #785 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php
2012-05-11 02:37:25 -04:00
..
en Merge PR #785 branch 'develop-olympus' into develop 2012-05-11 02:37:25 -04:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00