projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b58a98 f2e3733)
Merge pull request #12511 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 18 Jul 2018 22:56:17 +0000 (10:56 +1200)
committerGitHub <noreply@github.com>
Wed, 18 Jul 2018 22:56:17 +0000 (10:56 +1200)
Merge 5.4 to master


Trivial merge