Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-14-08-55-09
[civicrm-core.git] / templates / CRM / Activity / Selector /
drwxr-xr-x   ..
-rw-r--r-- 5767 Activity.tpl
-rw-r--r-- 4607 Selector.tpl