dolibarr/htdocs/expedition
Laurent Destailleur 100fa1067e Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
..
class Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
stats Removed closing php tag 2014-05-03 18:18:44 +02:00
tpl Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
card.php Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
contact.php Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
index.php Fix: Maxi debug of module productbatch. 2014-12-05 16:04:37 +01:00
list.php Merge remote-tracking branch 'origin/3.7' into develop 2015-04-18 04:18:59 +02:00
note.php Bad width 2015-01-23 18:41:53 +01:00
shipment.php Merge branch 'develop' into constants 2015-03-30 02:36:46 +02:00