Merge pull request #11504 from colemanw/CRM-17352
authorcolemanw <coleman@civicrm.org>
Mon, 15 Jan 2018 02:50:23 +0000 (21:50 -0500)
committerGitHub <noreply@github.com>
Mon, 15 Jan 2018 02:50:23 +0000 (21:50 -0500)
CRM-17352 - Use Backbone.noConflict

1  2 
CRM/Utils/System/Drupal8.php

Simple merge