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

Browse Source

Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php

...

This commit is contained in:

Laurent Destailleur

2014-12-26 04:44:15 +01:00

parent d18770c1e7 0e952c67ff

commit 657fc1b91c

6744 changed files with 159887 additions and 413514 deletions

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

831

htdocs/core/lib/functions.lib.php

File diff suppressed because it is too large Load Diff