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

Conflicts:
	htdocs/public/websites/index.php
This commit is contained in:
Laurent Destailleur 2017-07-21 02:32:01 +02:00
commit 522f21e528

View File

@ -2,6 +2,11 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
***** ChangeLog for 7.0.0 compared to 6.0.* *****
***** ChangeLog for 6.0.0 compared to 5.0.* *****
For developers: