Marc Alexander 2e31cae7bf Merge branch 'ticket/13930' into ticket/13930-master ...

Conflicts:
	phpBB/includes/acp/acp_database.php

2015-06-08 15:39:47 +02:00

..

sphinx

…

base.php

…

fulltext_mysql.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

fulltext_native.php

Merge branch '3.1.x'

2015-06-08 01:59:09 +02:00

fulltext_postgres.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

fulltext_sphinx.php

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

index.htm

…