From: colemanw <coleman@civicrm.org>
Date: Sat, 5 Mar 2016 02:20:06 +0000 (-0500)
Subject: Merge pull request #7923 from PalanteJon/CRM-18165
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ffcc8042bd3585ba86fdbdefba9c376de29be0e6;p=civicrm-core.git

Merge pull request #7923 from PalanteJon/CRM-18165

CRM-18165 - Fix display of activities when recurring activity is present
---

ffcc8042bd3585ba86fdbdefba9c376de29be0e6