projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb82206 6ca5a1f)
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)
Resolve a conflict with Wordpress CSS


Trivial merge