projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17b5973 244d954)
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-11-02-53-53
authorTim Otten <totten@civicrm.org>
Thu, 11 Apr 2013 06:53:55 +0000 (02:53 -0400)
committerTim Otten <totten@civicrm.org>
Thu, 11 Apr 2013 06:53:55 +0000 (02:53 -0400)
1  2 
CRM/Activity/BAO/Activity.php patch | diff1 | diff2 | blob | history
css/civicrm.css patch | diff1 | diff2 | blob | history

diff --cc CRM/Activity/BAO/Activity.php
Simple merge
diff --cc css/civicrm.css
Simple merge