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

..

expression/binary

…

definenode.php

Merge pull request #3560 from Nicofuma/ticket/13790

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

event.php

…

includeasset.php

…

includecss.php

…

includejs.php

…

includenode.php

…

includephp.php

Merge pull request #3560 from Nicofuma/ticket/13790

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

php.php

…