projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4679fef 35b6310)
Merge pull request #8344 from darrick/CRM-18515
authorMichael McAndrew <michaelmcandrew@thirdsectordesign.org>
Mon, 10 Oct 2016 22:26:50 +0000 (23:26 +0100)
committerGitHub <noreply@github.com>
Mon, 10 Oct 2016 22:26:50 +0000 (23:26 +0100)
CRM-18515 - Allow Payment Processor with same name when using multi-d…

1  2 
CRM/Admin/Form/PaymentProcessor.php patch | diff1 | diff2 | blob | history
CRM/Core/DAO.php patch | diff1 | diff2 | blob | history
CRM/Utils/Rule.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Admin/Form/PaymentProcessor.php
Simple merge
diff --cc CRM/Core/DAO.php
Simple merge
diff --cc CRM/Utils/Rule.php
Simple merge