Merge pull request #8021 from JKingsnorth/CRM-18288
authorcolemanw <coleman@civicrm.org>
Thu, 24 Mar 2016 14:37:30 +0000 (10:37 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 24 Mar 2016 14:37:30 +0000 (10:37 -0400)
commita38012804f84a8c30ddea92c51b1825206fd2006
tree9e89b6aa18817f3f15edd0e2cf9462cad97ee661
parentc4b857d6672d2db5b50fafd0152a09e294512463
parentd9b043a1f45556f186934d9f191f2ffb8bfca6a9
Merge pull request #8021 from JKingsnorth/CRM-18288

CRM-18288: Fix mergeBlock JS for location types