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
..
acp	Merge branch 'develop-olympus' into develop	2013-06-05 01:55:49 +05:30
email	[ticket/11471] Unrelated text in e-mail templates	2013-04-24 20:07:05 +02:00
mods	[feature/sphinx-fulltext-search] integrate sphinx language keys with core	2012-07-12 17:31:49 +05:30
app.php	[feature/controller] Remove unused language strings	2012-11-18 15:51:32 -05:00
captcha_qa.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
captcha_recaptcha.php	[ticket/9975] Moved a few E_USER_ERROR errors to /language	2013-04-23 09:55:36 -07:00
common.php	Merge branch 'develop-olympus' into develop	2013-05-26 19:19:08 +02:00
groups.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
help_bbcode.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
help_faq.php	[ticket/10771] changed value in help_faq.php	2012-12-02 14:51:28 +05:30
index.htm	ISO	2002-10-04 12:40:07 +00:00
install.php	[feature/migrations] Remove hardcoded language, use lang instead.	2013-02-06 11:35:53 -06:00
iso.txt	#10549	2007-05-13 22:20:30 +00:00
mcp.php	[ticket/9975] Moved a few E_USER_ERROR errors to /language	2013-04-23 09:55:36 -07:00
memberlist.php	[ticket/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01:00
migrator.php	Merge remote-tracking branch 'EXreaction/ticket/11394' into develop	2013-03-04 15:10:48 -05:00
posting.php	[ticket/11010] adding type="number" and type="date" to prosilver	2013-05-20 18:39:59 +02:00
search.php	[ticket/11032] fix language of error displayed	2012-08-15 22:57:02 +05:30
search_ignore_words.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
search_synonyms.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
ucp.php	[ticket/10325] fix language in acp and ucp	2013-04-30 22:59:32 +05:30
viewforum.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
viewtopic.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00