Merge remote-tracking branch 'origin/1.x' into update-EPIC-OEL-1255
Conflicts: Keep the oe_bootstrap_theme version from HEAD, it is already ahead of what's in MERGE_HEAD.
Showing
- modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module 15 additions, 12 deletions...whitelabel_multilingual/oe_whitelabel_multilingual.module
- modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--full.html.twig 1 addition, 1 deletion...starter_event/templates/node--oe-sc-event--full.html.twig
- package.json 1 addition, 1 deletionpackage.json
- templates/patterns/modal/modal-language.html.twig 1 addition, 89 deletionstemplates/patterns/modal/modal-language.html.twig
- tests/src/Kernel/AuthenticationBlockTest.php 1 addition, 1 deletiontests/src/Kernel/AuthenticationBlockTest.php
- tests/src/Kernel/FooterBlockTest.php 2 additions, 2 deletionstests/src/Kernel/FooterBlockTest.php
- tests/src/Kernel/MultilingualBlockTest.php 3 additions, 5 deletionstests/src/Kernel/MultilingualBlockTest.php
Loading
Please register or sign in to comment