Skip to content
Snippets Groups Projects
Commit 12e53f92 authored by Larry Garfield's avatar Larry Garfield
Browse files

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
parents 71cf6406 fe01ab6e
Branches
Tags
Loading
Showing
with 254 additions and 105 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment