Merge remote-tracking branch 'origin/2.4' into 3.0

Browse Source

Conflicts:
	.travis.yml
	composer.json

...

This commit is contained in:

Ingo Schommer 2013-05-17 00:38:26 +02:00

parent 04bb85a78d f8cfb5afd6

commit d7c937710a

2 changed files with 2 additions and 2 deletions

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