projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e0c2d3 4d834a9)
Merge pull request #8031 from eileenmcnaughton/CRM-18307-trash
authorYashodha Chaku <yashodha.chaku@webaccessglobal.com>
Tue, 29 Mar 2016 05:07:04 +0000 (10:37 +0530)
committerYashodha Chaku <yashodha.chaku@webaccessglobal.com>
Tue, 29 Mar 2016 05:07:04 +0000 (10:37 +0530)
CRM-18307 fix error on merge when undelete is off


Trivial merge