projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ef27eb 1a6be89)
Merge pull request #15199 from civicrm/5.17
authorEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 3 Sep 2019 05:25:24 +0000 (17:25 +1200)
committerGitHub <noreply@github.com>
Tue, 3 Sep 2019 05:25:24 +0000 (17:25 +1200)
5.17 to master

1  2 
CRM/Event/BAO/Event.php patch | diff1 | diff2 | blob | history
api/v3/Event.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Event/BAO/Event.php
Simple merge
diff --cc api/v3/Event.php
Simple merge