projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e04afcb 56fa9d4)
Merge pull request #6450 from civicrm/4.6
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 10 Aug 2015 01:07:22 +0000 (13:07 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 10 Aug 2015 01:07:22 +0000 (13:07 +1200)
Merge 4.6 to master

1  2 
CRM/Admin/Form/ParticipantStatusType.php patch | diff1 | diff2 | blob | history
CRM/Core/BAO/CustomField.php patch | diff1 | diff2 | blob | history
CRM/Core/BAO/Mapping.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Core/BAO/CustomField.php
Simple merge
diff --cc CRM/Core/BAO/Mapping.php
Simple merge