Oleksandr Gorkun a656f201c6 Merge branch '2.4-develop' of https://github.com/magento/magento2ce into MC-33823 ...

 Conflicts:

	app/etc/di.xml

2020-05-26 10:20:37 -05:00

..

adminhtml

Cleanup system.xml files

2020-01-12 23:34:08 +01:00

acl.xml

Remove the copyright year from file headers

2017-02-22 09:09:36 +00:00

config.xml

MAGETWO-70580: Merged fixes

2017-09-14 13:43:08 -05:00

csp_whitelist.xml

MC-24063: [2.4.x Port] Implement CSP

2020-03-23 16:08:20 -05:00

db_schema_whitelist.json

MAGETWO-92279: An incorrect result of declaration:generate:whitelist execution

2018-08-16 15:26:18 -05:00

db_schema.xml

MC-14884: MySQL-8 and MariaDB-10.4 support

2020-05-18 20:48:36 +02:00

di.xml

Remove the copyright year from file headers

2017-02-22 09:09:36 +00:00

module.xml

MAGETWO-87551: Convert existing data install/upgrade scripts

2018-02-13 17:54:09 +02:00