Merge tag 'v1.2.11' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 23 Jun 2016 18:19:24 +0000 (14:19 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 23 Jun 2016 18:19:24 +0000 (14:19 -0400)
Improved map handling with new event.

1  2 
views/admin/events/edit.html

Simple merge