1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 19:07:27 +01:00
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
..