Merge pull request #13502 from colemanw/shortcode
authorcolemanw <coleman@civicrm.org>
Thu, 31 Jan 2019 18:39:20 +0000 (13:39 -0500)
committerGitHub <noreply@github.com>
Thu, 31 Jan 2019 18:39:20 +0000 (13:39 -0500)
Fix shortcode button when popup setting is disabled

1  2 
CRM/Core/Form/ShortCode.php

Simple merge