projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5948bc7 9fd4371)
Merge branch '4.4' of https://github.com/civicrm/civicrm-core
authorColeman Watts <coleman@civicrm.org>
Fri, 7 Feb 2014 22:07:27 +0000 (14:07 -0800)
committerColeman Watts <coleman@civicrm.org>
Fri, 7 Feb 2014 22:07:27 +0000 (14:07 -0800)
Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Activity/Form/Task/AddToTag.tpl
xml/version.xml

1  2 
CRM/Activity/BAO/Activity.php patch | diff1 | diff2 | blob | history
CRM/Core/BAO/Dashboard.php patch | diff1 | diff2 | blob | history
xml/schema/Core/IM.xml patch | diff1 | diff2 | blob | history

diff --cc CRM/Activity/BAO/Activity.php
Simple merge
diff --cc CRM/Core/BAO/Dashboard.php
Simple merge
diff --cc xml/schema/Core/IM.xml
Simple merge