projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97dbd88 aa530a8)
Merge pull request #12274 from civicrm/5.2
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 6 Jun 2018 13:09:57 +0000 (01:09 +1200)
committerGitHub <noreply@github.com>
Wed, 6 Jun 2018 13:09:57 +0000 (01:09 +1200)
5.2 to master


Trivial merge