Commit 8a84178
authored
Merge pull request #1084 from magento-engcom/2.1-develop-prs
[EngCom] Public Pull Requests - 2.1
- MAGETWO-68903: Backport of MAGETWO-57675 for Magento 2.1: WYSIWYG editor does not show. #6222 #4828 #6815 #9499
- MAGETWO-68902: Backport of MAGETWO-54798 For Magento 2.1: One page checkout - Street Address should highlight red when data is missing #9500File tree
2 files changed
+5
-1
lines changed- app/code/Magento/Checkout/Block/Checkout
- lib/web/mage/adminhtml/wysiwyg/tiny_mce
2 files changed
+5
-1
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
281 | 281 | | |
282 | 282 | | |
283 | 283 | | |
284 | | - | |
| 284 | + | |
285 | 285 | | |
286 | 286 | | |
287 | 287 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
56 | 60 | | |
57 | 61 | | |
58 | 62 | | |
| |||
0 commit comments