projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 321745f d46561f)
Merge pull request #2006 from civicrm/4.3
authorcolemanw <coleman@civicrm.org>
Sun, 17 Nov 2013 01:06:39 +0000 (17:06 -0800)
committercolemanw <coleman@civicrm.org>
Sun, 17 Nov 2013 01:06:39 +0000 (17:06 -0800)
Merge branch 4.3 into 4.4

1  2 
CRM/Core/Session.php patch | diff1 | diff2 | blob | history
templates/CRM/common/print.tpl patch | diff1 | diff2 | blob | history
templates/CRM/common/snippet.tpl patch | diff1 | diff2 | blob | history

diff --cc CRM/Core/Session.php
Simple merge
diff --cc templates/CRM/common/print.tpl
Simple merge
diff --cc templates/CRM/common/snippet.tpl
Simple merge