Prepare 3.6.1
Prepare 3.6.1
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Fix: packager
Fix: doxygen
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
parameter).
Merge remote-tracking branch 'origin/3.6' into 3.6_backported

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php