Merge pull request #7293 from JKingsnorth/CRM-17585-4.6
authorDave Greenberg <dave@civicrm.org>
Wed, 9 Dec 2015 18:13:29 +0000 (10:13 -0800)
committerDave Greenberg <dave@civicrm.org>
Wed, 9 Dec 2015 18:13:29 +0000 (10:13 -0800)
commit3aabf33ac00dcf13ca10f3754db90a1ced6f492e
tree876f2283615376cde9d959877f86f4fbd61b0b5a
parentc265ac82a464b996c225a373a942f88a08d185aa
parentdb22eef26aa83a35dcebb48ef86d58fb4e47a73c
Merge pull request #7293 from JKingsnorth/CRM-17585-4.6

CRM-17584 and CRM-17585: Fixes for JS on merge screen