Fisheye: Diff - In-Portal/branches/5.3.x/.htaccess

Tree
Options

16600

Merge of "in-portal/branches/5.2.x@16599" to "in-portal/branches/5.3.x@16597".

Conflicts:

core/admin_templates/categories/categories_edit.tpl
core/admin_templates/forms/form_edit_emails.tpl
core/admin_templates/forms/forms_edit.tpl
core/admin_templates/incs/form_blocks.tpl
core/admin_templates/languages/email_template_edit.tpl
core/admin_templates/mailing_lists/mailing_list_edit.tpl
core/admin_templates/popups/translator.tpl
core/admin_templates/promo_blocks/promo_block_edit.tpl
core/admin_templates/regional/email_template_edit.tpl
core/admin_templates/regional/languages_edit.tpl
core/install/english.lang
core/install/install_data.sql
core/install/upgrades.css
core/install/upgrades.sql
core/kernel/constants.php
core/kernel/utility/email.php
core/kernel/utility/formatters/date_formatter.php
core/units/categories/categories_event_handler.php
core/units/email_queue/email_queue_eh.php
core/units/email_templates/email_template_eh.php
core/units/helpers/csv_helper.php
core/units/helpers/deployment_helper.php
core/units/helpers/mailing_list_helper.php
core/units/helpers/skin_helper.php
core/units/mailing_lists/mailing_list_eh.php

16503

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

26 Dec 16 Alex 16503

Loading ...