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

Browse Source

Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php

...

This commit is contained in:

Laurent Destailleur

2015-06-29 00:09:28 +02:00

parent 9c99cae911 6fb53ecb97

commit dc050d39eb

3692 changed files with 229730 additions and 91037 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

654

htdocs/core/lib/functions.lib.php

File diff suppressed because it is too large Load Diff