From: colemanw <coleman@civicrm.org>
Date: Mon, 15 Jan 2018 02:50:23 +0000 (-0500)
Subject: Merge pull request #11504 from colemanw/CRM-17352
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3d47a43c3618d994abc7d872f43c3252172aff2b;p=civicrm-core.git

Merge pull request #11504 from colemanw/CRM-17352

CRM-17352 - Use Backbone.noConflict
---

3d47a43c3618d994abc7d872f43c3252172aff2b