Merge branch 'develop' into EPIC-8999-OSS-Translation
# Conflicts: # composer.lock
Showing
- composer.json 5 additions, 5 deletionscomposer.json
- composer.lock 9 additions, 9 deletionscomposer.lock
- resources/patch/php/drupal/core/2329253-10.x.patch 69 additions, 0 deletionsresources/patch/php/drupal/core/2329253-10.x.patch
- resources/patch/php/drupal/imagecache_external/3390948.diff 11 additions, 31 deletionsresources/patch/php/drupal/imagecache_external/3390948.diff
- resources/patch/php/drupal/imagecache_external/3398665.diff 29 additions, 23 deletionsresources/patch/php/drupal/imagecache_external/3398665.diff
- resources/patch/php/drupal/imagecache_external/imagecache_external-wrong_setting_key-3424594-5--complete.patch 0 additions, 314 deletions...ache_external-wrong_setting_key-3424594-5--complete.patch
- resources/patch/php/drupal/og_menu/3392055.diff 18 additions, 13 deletionsresources/patch/php/drupal/og_menu/3392055.diff
- tests/features/update/update-ISAICP-9076.feature 9 additions, 0 deletionstests/features/update/update-ISAICP-9076.feature
- web/modules/custom/collection/collection.module 1 addition, 23 deletionsweb/modules/custom/collection/collection.module
- web/modules/custom/custom_page/custom_page.module 3 additions, 2 deletionsweb/modules/custom/custom_page/custom_page.module
- web/modules/custom/joinup_core/joinup_core.deploy.php 48 additions, 0 deletionsweb/modules/custom/joinup_core/joinup_core.deploy.php
- web/modules/custom/joinup_core/joinup_core.monolog.services.yml 2 additions, 2 deletions...dules/custom/joinup_core/joinup_core.monolog.services.yml
- web/modules/custom/joinup_core/src/JoinupCoreServiceProvider.php 2 additions, 2 deletions...ules/custom/joinup_core/src/JoinupCoreServiceProvider.php
- web/modules/custom/joinup_group/src/Entity/GroupInterface.php 8 additions, 0 deletions...modules/custom/joinup_group/src/Entity/GroupInterface.php
- web/modules/custom/joinup_group/src/Entity/GroupTrait.php 16 additions, 0 deletionsweb/modules/custom/joinup_group/src/Entity/GroupTrait.php
- web/modules/custom/joinup_group/src/Plugin/Block/GroupMenuBlock.php 2 additions, 2 deletions...s/custom/joinup_group/src/Plugin/Block/GroupMenuBlock.php
- web/modules/custom/solution/solution.module 1 addition, 23 deletionsweb/modules/custom/solution/solution.module
- web/profiles/joinup/src/Form/ExportStatisticsPerGroupForm.php 1 addition, 1 deletion...profiles/joinup/src/Form/ExportStatisticsPerGroupForm.php
- web/themes/ventuno/assets/css/etrans.min.css 1 addition, 1 deletionweb/themes/ventuno/assets/css/etrans.min.css
- web/themes/ventuno/assets/css/layout.min.css 1 addition, 1 deletionweb/themes/ventuno/assets/css/layout.min.css
Loading
Please register or sign in to comment