projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4af6b76 284735f)
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-03-23-41-12
authorkurund <kurund@civicrm.org>
Mon, 4 May 2015 03:48:13 +0000 (23:48 -0400)
committerkurund <kurund@civicrm.org>
Mon, 4 May 2015 03:48:13 +0000 (23:48 -0400)
Conflicts:
CRM/Report/Form/Contribute/TopDonor.php

1  2 
CRM/Contribute/BAO/Query.php patch | diff1 | diff2 | blob | history
CRM/Report/Form/Contribute/TopDonor.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Contribute/BAO/Query.php
Simple merge