projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70ff00f 4fa8939)
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-12-16-00-15
authorKurund Jalmi <kurund@yahoo.com>
Mon, 12 Oct 2015 16:12:55 +0000 (17:12 +0100)
committerKurund Jalmi <kurund@yahoo.com>
Mon, 12 Oct 2015 16:12:55 +0000 (17:12 +0100)
Conflicts:
CRM/Contribute/Form/Contribution.php

1  2 
CRM/Price/Form/Field.php patch | diff1 | diff2 | blob | history
CRM/Price/Form/Option.php patch | diff1 | diff2 | blob | history
api/v3/utils.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Price/Form/Field.php
Simple merge
diff --cc CRM/Price/Form/Option.php
Simple merge
diff --cc api/v3/utils.php
Simple merge