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

Merge remote-tracking branch 'upstream/8.x' into kernel 

Conflicts:
	core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php
	core/modules/update/update.fetch.inc
parents 1c442e85 cb80acc5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 134 additions and 106 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment