-
Larry Garfield authored
Conflicts: core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php core/modules/update/update.fetch.inc
2a8b9b7e
Conflicts: core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php core/modules/update/update.fetch.inc