Added the current uncommited changes to production code, and rebased to 4.6.8
[civicrm-core.git] / CRM / Activity /
drwxr-xr-x   ..
-rw-r--r-- 5433 ActionMapping.php
drwxr-xr-x - BAO
drwxr-xr-x - Controller
drwxr-xr-x - DAO
drwxr-xr-x - Form
drwxr-xr-x - Import
drwxr-xr-x - Page
drwxr-xr-x - Selector
drwxr-xr-x - StateMachine
-rw-r--r-- 5905 Task.php
-rw-r--r-- 5362 Tokens.php