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