Joas Schilling 7f7b09fdeb Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php

2016-01-09 18:45:32 +01:00

..

code_sniffer

…

webpi

…

build_announcement.php

…

build_changelog.php

…

build_helper.php

…

build.xml

Merge branch '3.1.x'

2016-01-09 18:45:32 +01:00

compare.sh

…

package.php

…

sami-all.conf.php

…

sami-checkout.conf.php

…