Merge branch '1.0' into 2.0

Browse Source

* 1.0:
  composer.json: update PHP_Compat requirements

Conflicts:
	composer.json

...

This commit is contained in:

Andreas Fischer 2015-06-07 17:49:35 +02:00

parent 496c8f9476 fcf74f3e6b

commit 5dd807ea5f

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

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

Diff Content Not Available