Nils Adermann f958d05aed Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock

2015-05-30 10:58:40 +02:00

..

code_sniffer

Merge pull request #3560 from Nicofuma/ticket/13790

2015-05-30 10:53:47 +02:00

webpi

…

build_announcement.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

build_changelog.php

[ticket/13208] Add security issues to the final changelog

2014-10-23 12:36:27 +02:00

build_helper.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

build.xml

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

compare.sh

…

package.php

Merge branch 'develop-ascraeus' into develop

2015-01-11 15:43:51 +05:30

sami-all.conf.php

[ticket/13738] Use new branch names in sami-all.conf.php.

2015-04-02 12:30:39 +02:00

sami-checkout.conf.php

[ticket/13331] Use docs target for this branch, add docs-all for dev branches.

2014-11-12 21:40:26 +01:00