Merge pull request #14565 from vingle/patch-6
authorEileen McNaughton <emcnaughton@wikimedia.org>
Mon, 17 Jun 2019 14:30:52 +0000 (10:30 -0400)
committerGitHub <noreply@github.com>
Mon, 17 Jun 2019 14:30:52 +0000 (10:30 -0400)
commitb373638b76088c2c3d9d80e93695261f723cfe23
tree3c2cbede3c815a9907d95fb9077ca8c73b3feb5c
parentcb82206232f6af767aad1109904e5f00bc9541e0
parent6ca5a1f942725a7e5f6287b8b83c2a774fc3f135
Merge pull request #14565 from vingle/patch-6

Resolve a conflict with Wordpress CSS