projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a88b47 31a74cc)
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-20-23-29-59
authorkurund <kurund@civicrm.org>
Tue, 21 Apr 2015 05:30:02 +0000 (23:30 -0600)
committerkurund <kurund@civicrm.org>
Tue, 21 Apr 2015 05:30:02 +0000 (23:30 -0600)
1  2 
CRM/Contact/Form/Contact.php patch | diff1 | diff2 | blob | history
js/Common.js patch | diff1 | diff2 | blob | history

diff --cc CRM/Contact/Form/Contact.php
Simple merge
diff --cc js/Common.js
Simple merge