Merge branch 'develop-olympus' into develop-ascraeus

Browse Source

Conflicts:
	.travis.yml
	travis/phpunit-mysqli-travis.xml

...

This commit is contained in:

Marc Alexander

2015-02-13 12:06:07 +01:00

parent 39a3f4f6c8 877774a296

commit 9e3bc9a3f9

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

Diff Content Not Available