Laurent Destailleur 67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

2018-11-03 19:15:52 +01:00

..

doc_generic_user_odt.modules.php

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

2018-11-03 19:15:52 +01:00