projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7231faa c86f444)
Merge branch 4.5 into master
authorColeman Watts <coleman@civicrm.org>
Mon, 26 Jan 2015 16:38:59 +0000 (11:38 -0500)
committerColeman Watts <coleman@civicrm.org>
Mon, 26 Jan 2015 16:38:59 +0000 (11:38 -0500)
1  2 
CRM/Contact/Page/AJAX.php patch | diff1 | diff2 | blob | history
CRM/Core/xml/Menu/Contact.xml patch | diff1 | diff2 | blob | history
templates/CRM/Case/Page/Tab.tpl patch | diff1 | diff2 | blob | history

diff --cc CRM/Contact/Page/AJAX.php
Simple merge
diff --cc CRM/Core/xml/Menu/Contact.xml
Simple merge
diff --cc templates/CRM/Case/Page/Tab.tpl
Simple merge