Merge remote-tracking branch 'origin/3.5' into develop

Browse Source

Conflicts:
	test/phpunit/DateLibTzFranceTest.php
	test/phpunit/ModulesTest.php

...

This commit is contained in:

Laurent Destailleur 2014-05-18 11:59:51 +02:00

parent b7f55ea99c 0e13ded641

commit 01e3e13865

9 changed files with 9 additions and 9 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