Skip to content

Commit 7115c24

Browse files
committed
Fixed conflict
1 parent 498d966 commit 7115c24

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

README.md

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,18 @@ Most important changes will be listed here, all other changes since `19.4.0` can
101101
- bug fixes and PHP 7.x, 8.0 and 8.1 compatibility
102102
- added config cache for system.xml [#1916](https://github.com/OpenMage/magento-lts/pull/1916)
103103
- search for "NULL" in backend grids [#1203](https://github.com/OpenMage/magento-lts/pull/1203)
104+
- removed modules `Mage_Compiler`, `Mage_GoogleBase`, `Mage_Xmlconnect`, `Phoenix_Moneybookers`
104105

105106
### Between OpenMage 19.x and 20.x
106107

107108
Do not use 20.x.x if you need IE support.
108109

109-
- removed IE conditional comments, IE styles, IE scripts and IE eot files #1073
110-
- removed frontend default themes (default, modern, iphone, german, french, blank, blue) #1600
111-
- fixed incorrect datetime in customer block (`$useTimezone` parameter) #1525
112-
- add redis as a valid option for `global/session_save` #1513
113-
- reduce needless saves by avoiding setting `_hasDataChanges` flag #2066
114-
- removed support for `global/sales/old_fields_map` defined in XML #921
115-
- removed Mage_PageCache module #2258
116-
- removed lib/flex containing unused ActionScript "file uploader" files #2271
110+
- removed IE conditional comments, IE styles, IE scripts and IE eot files [#1073](https://github.com/OpenMage/magento-lts/pull/1073)
111+
- removed frontend default themes (default, modern, iphone, german, french, blank, blue) [#1600](https://github.com/OpenMage/magento-lts/pull/1600)
112+
- fixed incorrect datetime in customer block (`$useTimezone` parameter) [#1525](https://github.com/OpenMage/magento-lts/pull/1525)
113+
- added redis as a valid option for `global/session_save` [#1513](https://github.com/OpenMage/magento-lts/pull/1513)
114+
- removed module `Mage_PageCache`
115+
- enabled website level config cache [#2355](https://github.com/OpenMage/magento-lts/pull/2355)
117116

118117
For full list of changes, you can [compare tags](https://github.com/OpenMage/magento-lts/compare/1.9.4.x...20.0).
119118

@@ -141,13 +140,6 @@ For full list of changes, you can [compare tags](https://github.com/OpenMage/mag
141140

142141
[Full list of events](docs/EVENTS.md)
143142

144-
### Removed Modules
145-
146-
- `Mage_Compiler`
147-
- `Mage_GoogleBase`
148-
- `Mage_Xmlconnect`
149-
- `Phoenix_Moneybookers`
150-
151143
## Development Environment with ddev
152144

153145
- Install [ddev](https://ddev.com/get-started/)

0 commit comments

Comments
 (0)