dolibarr/htdocs/comm
Laurent Destailleur 489e766cbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/ticket/class/ticket.class.php
2018-08-29 20:24:01 +02:00
..
action Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-29 20:22:50 +02:00
admin standardize 2018-07-29 13:40:35 +02:00
mailing Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 15:47:55 +02:00
propal Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-29 20:22:50 +02:00
prospect standardize 2018-07-29 17:17:29 +02:00
address.php loadlangs 2018-05-26 20:32:23 +02:00
card.php Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info 2018-08-28 02:48:05 +02:00
contact.php standardize 2018-07-29 17:17:29 +02:00
index.php standardize 2018-07-29 17:17:29 +02:00
multiprix.php standardize 2018-07-29 17:17:29 +02:00
recap-client.php standardize 2018-07-29 17:17:29 +02:00
remise.php standardize 2018-07-29 17:17:29 +02:00
remx.php standardize 2018-07-29 17:17:29 +02:00