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

Conflicts: htdocs/public/websites/index.php
Dolibarr · Jul 21, 2017 · 522f21e · 522f21e
2 parents 2825465 + 5318e51
commit 522f21e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -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: