projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6e5f04 c99c68b)
Merge pull request #18696 from colemanw/btnNoConflict
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 7 Oct 2020 19:15:15 +0000 (08:15 +1300)
committerGitHub <noreply@github.com>
Wed, 7 Oct 2020 19:15:15 +0000 (08:15 +1300)
Greenwich - fix conflict btw bootstrap & jQuery UI button


Trivial merge