forked from Wavyzz/dolibarr
Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41
Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41