mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

Browse Source 
Conflicts:
	phpBB/install/database_update.php
This commit is contained in:
Nathaniel Guse
2013-02-26 15:32:27 -06:00
parent d2295b3d1f 80bd78a5e5
commit a01da0c1ee
79 changed files with 3906 additions and 3090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/ucp.php
View File

@@ -173,7 +173,6 @@ $lang = array_merge($lang, array(
'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.',
'EMAIL_BANNED_EMAIL' => 'The email address you entered is not allowed to be used.',
'EMAIL_INVALID_EMAIL' => 'The email address you entered is invalid.',
'EMAIL_REMIND' => 'This must be the email address associated with your account. If you have not changed this via your user control panel then it is the email address you registered your account with.',
'EMAIL_TAKEN_EMAIL' => 'The entered email address is already in use.',
'EMPTY_DRAFT' => 'You must enter a message to submit your changes.',