merge with master
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 21:05:54 +0000 (22:05 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 21:05:54 +0000 (22:05 +0100)
commitaf3eac70d8dceb8e2ba0e053d7a2b70f4db24f36
treef9208d9a23e60919b120a429d747c1fa3359ad6c
parent258519d641581dc17d4deab66e516e5f4050da5f
parentfa052229cfaa78660180a6c994022efadccfbd3e
merge with master
src/components/map/map.ts