Laurent Destailleur 97dd1f4bbb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php

2016-08-01 15:03:59 +02:00

..

doc

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-08-01 15:03:59 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

mod_expedition_ribera.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

mod_expedition_safor.php

More substitutions

2014-06-12 11:31:53 +02:00

modules_expedition.php

Scrutinizer Auto-Fixes

2016-04-09 13:07:33 +00:00