Merge pull request #5720 from josephlacey/datatables-update
authorcolemanw <coleman@civicrm.org>
Thu, 7 May 2015 01:54:31 +0000 (21:54 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 7 May 2015 01:54:31 +0000 (21:54 -0400)
Datatables update

1  2 
CRM/Activity/Page/AJAX.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Page/AJAX.php
CRM/Core/Resources.php
CRM/Mailing/BAO/Mailing.php
css/civicrm.css
js/Common.js
templates/CRM/common/l10n.js.tpl

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc css/civicrm.css
Simple merge
diff --cc js/Common.js
Simple merge
Simple merge