Merge of "in-portal/branches/5.2.x@16691" to "in-portal/branches/5.3.x@16718".
Conflicts:
- composer.json
- composer.lock
- core/kernel/application.php
Merge of "in-portal/branches/5.2.x@16691" to "in-portal/branches/5.3.x@16718".
Conflicts:
alex | Aug 9 2022, 1:23 AM |
Buildable 1116 | |
Build 1116: After New Commit (Harbormaster Build Plan) |
Build #56 finished with FAILURE status: http://ci.in-portal.org/job/in-portal-53x/56/
Path | Packages | ||||
---|---|---|---|---|---|
M | (dir) | in-portal/branches/5.3.x/ | |||
M | in-portal/branches/5.3.x/composer.json | ||||
M | in-portal/branches/5.3.x/composer.lock | ||||
M | in-portal/branches/5.3.x/core/install.php | ||||
M | in-portal/branches/5.3.x/core/install/prerequisites.php | ||||
M | in-portal/branches/5.3.x/core/install/step_templates/sys_requirements.tpl | ||||
M | in-portal/branches/5.3.x/core/kernel/application.php | ||||
P | (dir) | in-portal/branches/5.3.x/core/kernel/security/ Copied from in-portal/branches/5.2.x/core/kernel/security | |||
P | in-portal/branches/5.3.x/core/kernel/security/SecurityEncrypter.php Copied from in-portal/branches/5.2.x/core/kernel/security/SecurityEncrypter.php | ||||
P | in-portal/branches/5.3.x/core/kernel/security/SecurityGenerator.php Copied from in-portal/branches/5.2.x/core/kernel/security/SecurityGenerator.php | ||||
P | in-portal/branches/5.3.x/core/kernel/security/SecurityGeneratorPromise.php Copied from in-portal/branches/5.2.x/core/kernel/security/SecurityGeneratorPromise.php | ||||
M | in-portal/branches/5.3.x/core/kernel/utility/system_config.php |