phpbb/phpBB/language/en/acp
Dhruv 3931f7f3b9 Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv (1)
* develop-olympus:
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.

Conflicts:
	phpBB/includes/search/fulltext_mysql.php
	phpBB/language/en/acp/search.php
2013-06-05 01:55:49 +05:30
..
attachments.php Merge branch 'develop-olympus' into develop 2012-05-31 11:55:12 +02:00
ban.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
board.php [ticket/10325] fix acp language 2013-05-04 14:44:33 +05:30
bots.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
common.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103 2012-12-13 19:21:29 -06: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/10631] Use exceptions for errors. Build action list dynamically. 2012-09-01 15:05:34 +01:00
forums.php [ticket/10650] Changed acp option from per forum to global 2012-04-08 10:34:44 +05:30
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/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
permissions_phpbb.php [ticket/10679] Add new permission for changing profile field information 2012-12-06 15:10:29 +01:00
posting.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
profile.php Merge branch 'develop-olympus' into develop 2012-07-23 15:50:54 +02:00
prune.php [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language 2013-04-25 11:23:09 -05:00
search.php Merge branch 'develop-olympus' into develop 2013-06-05 01:55:49 +05:30
styles.php [ticket/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +01:00
users.php Merge branch 'develop-olympus' into develop 2012-07-21 16:15:42 +02:00