projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit79cffafae988e139ad14440c7502710a23ac15fa
treeabb4ebafc9193f416a8f40f4890974fb715f746ctree | snapshot (zip tar.gz)
parent5948bc7c8518c0c30d8f700805858556570bab21commit | diff
parent9fd4371f0fcb25c3c2278a6857a0b59eafef0e55commit | diff
Merge branch '4.4' of https://github.com/civicrm/civicrm-core

Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Activity/Form/Task/AddToTag.tpl
xml/version.xml
CRM/Activity/BAO/Activity.php diff1 | diff2 | blob | history
CRM/Core/BAO/Dashboard.php diff1 | diff2 | blob | history
xml/schema/Core/IM.xml diff1 | diff2 | blob | history