merge
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 12:45:57 +0000 (13:45 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 12:45:57 +0000 (13:45 +0100)
commit330dd6d3afbced6f346ff27aab9dfcc309a59cb0
treed6537e580546e786852f4b0d877c7497ecb84926
parent064d7ca660843b31768ae673939010f238a37ec7
merge
src/components/map/map.html
src/components/map/map.ts