Merge of "in-portal/branches/5.2.x@16484" to "in-portal/branches/5.3.x@16440".
Merge of "in-portal/releases/5.2.2-B1@16502" to "in-portal/b… Show more
Merge of "in-portal/releases/5.2.2-B1@16502" to "in-portal/b… Show more
Merge of "in-portal/branches/5.2.x@16484" to "in-portal/branches/5.3.x@16440".
Merge of "in-portal/releases/5.2.2-B1@16502" to "in-portal/branches/5.3.x@16440".Conflicts:- .
- core/install/install_data.sql
- core/install/upgrades.css
- core/install/upgrades.sql
- core/kernel/managers/rewrite_url_processor.php
- core/kernel/utility/temp_handler.php
- core/kernel/utility/unit_config_reader.php
- core/units/helpers/deployment_helper.php
|
 |
