Merge pull request #18129 from seamuslee001/5.28
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 12 Aug 2020 01:18:17 +0000 (13:18 +1200)
committerGitHub <noreply@github.com>
Wed, 12 Aug 2020 01:18:17 +0000 (13:18 +1200)
commite766ce44bc2419718061c887b6285d65325af3c4
tree2cc98a1869406206c8f55d42d30ed1e2e4b7cd18
parentb14b45153e18c29ed57f85c703cee79ebb7a4d92
parentb6f9719217530dc37d650f81244629a8c072c615
Merge pull request #18129 from seamuslee001/5.28

dev/core#1934 fix regression on merging contacts with settings using …