projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc86b1b ad0ac12)
Merge pull request #7475 from JMAConsulting/CRM-16259-1
authorDave Greenberg <dave@civicrm.org>
Mon, 21 Dec 2015 03:20:59 +0000 (19:20 -0800)
committerDave Greenberg <dave@civicrm.org>
Mon, 21 Dec 2015 03:20:59 +0000 (19:20 -0800)
Crm 16259 1

1  2 
CRM/Contribute/BAO/Contribution.php patch | diff1 | diff2 | blob | history
sql/GenerateData.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge
diff --cc sql/GenerateData.php
Simple merge