projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5dcb5a e87bdf6)
Merge pull request #18023 from civicrm/5.28
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sat, 1 Aug 2020 03:47:36 +0000 (15:47 +1200)
committerGitHub <noreply@github.com>
Sat, 1 Aug 2020 03:47:36 +0000 (15:47 +1200)
5.28 to master

1  2 
CRM/Core/Error.php patch | diff1 | diff2 | blob | history
CRM/Upgrade/Incremental/php/FiveTwentyEight.php patch | diff1 | diff2 | blob | history
CRM/Utils/System/WordPress.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Core/Error.php
Simple merge
diff --cc CRM/Utils/System/WordPress.php
Simple merge