Joas Schilling a3883a6f23 Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-06-11 21:00:04 +02:00

..

convertors

Merge branch '3.1.x'

2015-06-11 21:00:04 +02:00

data

[feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback

2014-11-08 11:36:13 +01:00

schemas

[3.1.x] Increase dev version to 3.1.6-dev

2015-06-11 20:57:26 +02:00

database_update.php

Merge pull request #3554 from Nicofuma/ticket/13770

2015-05-29 10:56:54 +02:00

index.php

[ticket/13770] Fix tests

2015-05-14 23:04:23 +02:00

install_convert.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

install_install.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

install_main.php

[ticket/12708] Make the path absolute by using __DIR__.

2014-06-14 18:16:57 +02:00

install_update.php

[ticket/13770] Wither interface for container_builder

2015-05-14 23:04:03 +02:00

phpinfo.php

[ticket/12723] Add Sniff ensuring PHP files use the correct file header

2014-06-22 00:45:34 +02:00