projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d42e6ef 6ac95f0)
Merge pull request #3152 from pradpnayak/CRM-14112
authorDave Greenberg <dave@civicrm.org>
Sat, 10 May 2014 14:57:39 +0000 (07:57 -0700)
committerDave Greenberg <dave@civicrm.org>
Sat, 10 May 2014 14:57:39 +0000 (07:57 -0700)
Crm 14112

1  2 
CRM/Activity/BAO/Query.php patch | diff1 | diff2 | blob | history
CRM/Contact/BAO/Query.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Activity/BAO/Query.php
Simple merge
diff --cc CRM/Contact/BAO/Query.php
Simple merge