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)
dev/core#1934 fix regression on merging contacts with settings using …


Trivial merge