Merge branch '3.1.x'

Browse Source

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

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

...

This commit is contained in:

Nils Adermann

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

parent 3f4206e012 01073ffcbf

commit f958d05aed

22 changed files with 283 additions and 312 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

418

phpBB/composer.lock generated

File diff suppressed because it is too large Load Diff