projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fd26f7 c0dac05)
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-30-00-43-32
authorkurund <kurund@civicrm.org>
Mon, 29 Dec 2014 19:13:42 +0000 (00:43 +0530)
committerkurund <kurund@civicrm.org>
Mon, 29 Dec 2014 19:13:42 +0000 (00:43 +0530)
1  2 
CRM/Financial/BAO/FinancialItem.php patch | diff1 | diff2 | blob | history
xml/schema/Core/ActionSchedule.xml patch | diff1 | diff2 | blob | history

diff --cc CRM/Financial/BAO/FinancialItem.php
Simple merge
diff --cc xml/schema/Core/ActionSchedule.xml
Simple merge