projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e7a24fc 364ea80)
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-09-11-44-07
authorkurund <kurund@civicrm.org>
Mon, 9 Feb 2015 06:30:00 +0000 (12:00 +0530)
committerkurund <kurund@civicrm.org>
Mon, 9 Feb 2015 06:30:00 +0000 (12:00 +0530)
commitb7ff0a0a5544c5a5d510c685c8fdbdaecad7a5d0
tree5610c9f69333359d168db22e2ccd14b33bb239b5tree | snapshot (zip tar.gz)
parente7a24fcc8e9688c9441a4a33f6a6889b31ba24abcommit | diff
parent364ea80814862fdcfacbb00268ccc4287ac45f5dcommit | diff
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-09-11-44-07

Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Activity/BAO/Activity.php diff1 | diff2 | blob | history
CRM/Contribute/BAO/ContributionPage.php diff1 | diff2 | blob | history