COPYRIGHT

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

Merge of "in-portal/branches/5.2.x@16439" to "in-portal/branches/5.3.x@16429".

Merge of "in-portal/branches/5.2.x@16428" to "in-portal/branches/5.3.x@16395".

Merge of "in-portal/branches/5.2.x@16388" to "in-portal/branches/5.3.x@16391".

Conflicts:

• composer.lock
• core/admin_templates/catalog/advanced_view.tpl
• core/admin_templates/catalog/item_selector/item_selector_advanced_view.tpl
• core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
• core/admin_templates/config/config_edit.tpl
• core/admin_templates/incs/form_blocks.tpl
• core/admin_templates/incs/grid_blocks.tpl
• core/admin_templates/js/ajax_dropdown.js
• core/admin_templates/js/template_manager.js
• core/admin_templates/mailing_lists/send_queue.tpl
• core/admin_templates/reviews/reviews.tpl
• core/admin_templates/users/user_edit_items.tpl
• core/install/english.lang
• core/install/install_data.sql
• core/install/install_toolkit.php
• core/install/upgrades.php
• core/install/upgrades.sql
• core/kernel/application.php
• core/kernel/db/cat_event_handler.php
• core/kernel/db/db_event_handler.php
• core/kernel/db/db_tag_processor.php
• core/kernel/kbase.php
• core/kernel/managers/url_manager.php
• core/kernel/nparser/nparser_config.php
• core/kernel/session/session.php
• core/kernel/utility/event.php
• core/kernel/utility/factory.php
• core/kernel/utility/http_query.php
• core/kernel/utility/unit_config_reader.php
• core/units/admin/admin_config.php
• core/units/admin/admin_tag_processor.php
• core/units/categories/categories_config.php
• core/units/categories/categories_event_handler.php
• core/units/category_items/category_items_config.php
• core/units/email_queue/email_queue_config.php
• core/units/forms/form_fields/form_fields_config.php
• core/units/forms/form_submissions/form_submissions_config.php
• core/units/forms/forms/forms_config.php
• core/units/general/general_config.php
• core/units/helpers/image_helper.php
• core/units/helpers/language_import_helper.php
• core/units/helpers/modules_helper.php
• core/units/images/images_config.php
• core/units/logs/change_logs/change_logs_config.php
• core/units/logs/email_logs/email_logs_config.php
• core/units/logs/session_logs/session_logs_config.php
• core/units/mailing_lists/mailing_lists_config.php
• core/units/modules/modules_config.php
• core/units/page_revisions/page_revisions_config.php
• core/units/permissions/permissions_event_handler.php
• core/units/permissions/permissions_tag_processor.php
• core/units/phrases/phrases_config.php
• core/units/reviews/reviews_config.php
• core/units/scheduled_tasks/scheduled_task_eh.php
• core/units/scheduled_tasks/scheduled_tasks_config.php
• core/units/sections/sections_config.php
• core/units/site_domains/site_domains_config.php
• core/units/structure/structure_config.php
• core/units/themes/themes_config.php
• core/units/user_groups/user_groups_config.php
• core/units/users/users_config.php

Merge of "in-portal/branches/5.2.x@16189" to "in-portal/branches/5.3.x@16188".

Merge of "in-portal/branches/5.2.x@16121" to "in-portal/branches/5.3.x@16111".

Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094".

Merge of "in-portal/branches/5.2.x@15906" to "in-portal/branches/5.3.x@15902".

Merge of "in-portal/releases/5.2.1-B2@15839" to "in-portal/branches/5.3.x@15852".

Merge of "in-portal/releases/5.2.1-RC1@15881" to "in-portal/branches/5.3.x@15852".

Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3.x@15659".

Releasing version 'branches/5.3.x' (copy from 'branches/5.2.x') of 'in-portal' module.

Merge of "in-portal/releases/5.1.3@14548" to "in-portal/branches/5.2.x@14575".

Bug #0001025: Automatically set "svn:keywords" property to PHP files

INP-827

Merge of "in-portal/releases/5.1.1@14072" to "in-portal/branches/5.2.x@13841".

Releasing version 'branches/5.2.x' (copy from 'branches/5.1.x') of 'in-portal' module.

Merge of "in-portal/releases/5.0.4@13715" to "in-portal/branches/5.1.x@13749".

Merge of "w/in-portal.full/releases/5.0.4@13737" to "w/in-portal.full/branches/5.1.x@13398".

Merge of "profiles/in-portal.community/releases/5.0.4@13741" to "profiles/in-portal.community/branches/5.1.x@13399".

Merge of "w/in-portal.full/releases/5.0.3@13514" to "w/in-portal.full/branches/5.1.x@13398".

Merge of "profiles/in-portal.community/releases/5.0.3@13516" to "profiles/in-portal.community/branches/5.1.x@13399".

Merge of "in-portal/releases/5.0.2@13073" to "in-portal/branches/5.1.x@12657".

Releasing version 'branches/5.1.x' (copy from 'branches/RC')

Bug #0000135: Create LICENSE, README, CREDITS files for all modules

INP-113