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

[ticket/14377] Handle new $classname() in the sniffer

2015-12-23 18:45:37 +01:00

webpi

…

build_announcement.php

…

build_changelog.php

…

build_helper.php

Merge branch '3.0.x' into prep-release-3.1.5

2015-06-10 22:23:34 +02:00

build.xml

Merge branch '3.1.x'

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

compare.sh

…

package.php

[ticket/14039] Revamp updater

2015-10-17 23:05:57 +02:00

sami-all.conf.php

[ticket/13874] Add master to sami API docs

2015-05-28 13:19:52 +02:00

sami-checkout.conf.php

…