projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0114e4a 4d1ace4)
Merge pull request #12683 from civicrm/5.5
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 17 Aug 2018 07:51:31 +0000 (19:51 +1200)
committerGitHub <noreply@github.com>
Fri, 17 Aug 2018 07:51:31 +0000 (19:51 +1200)
5.5

1  2 
CRM/Export/BAO/Export.php patch | diff1 | diff2 | blob | history
CRM/Export/BAO/ExportProcessor.php patch | diff1 | diff2 | blob | history
tests/phpunit/CRM/Export/BAO/ExportTest.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Export/BAO/Export.php
Simple merge
diff --cc CRM/Export/BAO/ExportProcessor.php
Simple merge