Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop Conflicts: htdocs/install/mysql/migration/10.0.0-11.0.0.sql
This commit is contained in:
commit
8366d89b41
@ -81,4 +81,3 @@ ALTER TABLE llx_oauth_token ADD COLUMN fk_soc integer DEFAULT NULL after token;
|
||||
|
||||
ALTER TABLE llx_mailing ADD COLUMN tms timestamp;
|
||||
ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user