Laurent Destailleur 259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php

2017-09-08 13:30:54 +02:00

..

doc

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-09-08 13:30:54 +02:00

index.html

…

mod_arctic.php

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

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

mod_pacific.php

…

modules_fichinter.php

…