merge conflict

This commit is contained in:
jpb
2021-08-18 09:16:28 +02:00
1844 changed files with 33009 additions and 11032 deletions

View File

@@ -21,6 +21,7 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
date_creation datetime NOT NULL,
tms timestamp,
last_main_doc varchar(255),
lang varchar(6),
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_user_valid integer,