-
- Downloads
Merge remote-tracking branch 'upstream/8.x' into kernel
Resolve conflicts in cron improvements. Conflicts: core/INSTALL.txt core/includes/bootstrap.inc core/modules/simpletest/drupal_web_test_case.php core/modules/system/system.install core/modules/system/system.module core/modules/system/system.test core/scripts/cron-curl.sh core/scripts/cron-lynx.sh
Showing
- core/INSTALL.txt 4 additions, 4 deletionscore/INSTALL.txt
- core/MAINTAINERS.txt 4 additions, 0 deletionscore/MAINTAINERS.txt
- core/includes/ajax.inc 1 addition, 1 deletioncore/includes/ajax.inc
- core/includes/bootstrap.inc 37 additions, 9 deletionscore/includes/bootstrap.inc
- core/includes/common.inc 111 additions, 44 deletionscore/includes/common.inc
- core/includes/form.inc 5 additions, 5 deletionscore/includes/form.inc
- core/includes/gettext.inc 1 addition, 1 deletioncore/includes/gettext.inc
- core/includes/install.core.inc 11 additions, 13 deletionscore/includes/install.core.inc
- core/includes/lock.inc 4 additions, 3 deletionscore/includes/lock.inc
- core/includes/menu.inc 6 additions, 6 deletionscore/includes/menu.inc
- core/includes/module.inc 19 additions, 2 deletionscore/includes/module.inc
- core/includes/theme.inc 4 additions, 4 deletionscore/includes/theme.inc
- core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php 28 additions, 0 deletions.../lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
- core/misc/states.js 1 addition, 1 deletioncore/misc/states.js
- core/modules/aggregator/aggregator.module 1 addition, 1 deletioncore/modules/aggregator/aggregator.module
- core/modules/aggregator/aggregator.test 1 addition, 1 deletioncore/modules/aggregator/aggregator.test
- core/modules/block/block.module 9 additions, 4 deletionscore/modules/block/block.module
- core/modules/block/block.test 2 additions, 2 deletionscore/modules/block/block.test
- core/modules/book/book.module 1 addition, 1 deletioncore/modules/book/book.module
- core/modules/color/color.module 4 additions, 3 deletionscore/modules/color/color.module
Loading
Please register or sign in to comment