Merge remote-tracking branch 'origin/3.6' into 3.7

Browse Source

Conflicts:
	htdocs/main.inc.php

...

This commit is contained in:

Laurent Destailleur 2015-04-28 21:14:17 +02:00

parent 1a70e9c5f9 cfaaf56428

commit b0071a7c6c

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