FEAT #20239 TIME 01:00 Report code to resolve conflicts

config/config.default.json

src/app/attachment/controllers/AttachmentController.php

src/app/convert/controllers/ConvertThumbnailController.php

src/app/docserver/controllers/DocserverController.php

src/app/docserver/models/AdrModel.php

src/app/docserver/scripts/EncryptDocserverScript.php

...p/document/controllers/CertificateSignatureController.php

src/app/document/controllers/DigitalSignatureController.php

src/app/document/controllers/DocumentController.php

src/app/document/controllers/WatermarkController.php

src/app/history/controllers/HistoryController.php

src/app/user/controllers/SignatureController.php

src/core/models/CoreConfigModel.php