dolibarr/htdocs/expedition
Laurent Destailleur 97fce71218 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
..
class Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
stats Uniformize code and look and file for shipment statistics page. This 2013-07-25 15:02:40 +02:00
tpl Corrected incorrect lang trans key 2013-04-27 13:51:05 +02:00
contact.php Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
fiche.php Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
index.php Fix: Use correct translation key 2013-09-25 19:07:25 +02:00
liste.php standardize code 2013-06-20 09:18:12 +02:00
note.php remove debug string 2014-03-26 10:09:29 +01:00
shipment.php Fix: multilangs array was not loaded. 2014-03-12 01:21:18 +01:00