Laurent Destailleur
|
dc050d39eb
|
Merge remote-tracking branch 'origin/3.7' into develop
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
|
2015-06-29 00:09:28 +02:00 |
|