phpbb/phpBB/language/en/acp
Nils Adermann 854854b60f Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board

Conflicts:
	phpBB/includes/functions_messenger.php
2014-05-02 12:49:07 +02:00
..
attachments.php [ticket/12201] Add link to resync file stats after error. 2014-04-15 14:19:47 -07:00
ban.php Merge branch 'develop-olympus' into develop-ascraeus 2014-03-24 20:58:43 +01:00
board.php [ticket/8558] Use only one variable and improve explain string 2014-04-17 23:12:32 +02:00
bots.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
common.php Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into develop-ascraeus 2014-05-01 21:46:34 -05:00
database.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
email.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
extensions.php [ticket/12456] Fix duplicated empty lines in language files 2014-04-29 15:44:17 +02:00
forums.php [ticket/12150] Use shorter column names for prune settings 2014-03-29 22:14:58 +01:00
groups.php [ticket/10411] Use template loops instead of defining the html in php files 2013-02-25 20:24:11 +01:00
index.htm some bugfixes 2006-10-26 10:58:58 +00:00
language.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
modules.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
permissions.php [ticket/12456] Fix duplicated empty lines in language files 2014-04-29 15:44:17 +02:00
permissions_phpbb.php [ticket/11734] Readd accidently removed language strings of forum permissions 2013-07-23 16:26:01 +02:00
posting.php [ticket/12456] Add , after the last array element 2014-04-29 16:24:51 +02:00
profile.php [ticket/12251] Add string validation for a-zA-Z0-9 and underscore 2014-03-06 12:28:36 +01:00
prune.php [ticket/12045] Only display group selection if there are groups 2013-11-28 13:22:25 +01:00
search.php Merge branch 'develop-olympus' into develop 2013-06-05 01:55:49 +05:30
styles.php [ticket/8700] Use L_COLON instead of adding ":" manually 2014-04-02 00:23:26 +02:00
users.php Merge branch 'develop-olympus' into develop 2014-03-13 10:27:19 +01:00