Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-23-22-46-27
[civicrm-core.git] / templates / CRM / Activity / Page /
drwxr-xr-x   ..
-rw-r--r-- 2289 Tab.tpl
-rw-r--r-- 3907 UserDashboard.tpl