merge med master
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Wed, 9 Dec 2015 20:09:38 +0000 (21:09 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Wed, 9 Dec 2015 20:09:38 +0000 (21:09 +0100)
commit58627f9cc7d8092431449f070cab373c65ad3cda
treee10be91d8bca1c9e9235e8eea2f6e5371b61371b
parentd7f50e3ac2fdc2c6b44666a2d1bd3c1064269fcb
parentbd209f35a6a638a2adcb0620420266b29d3d8a8f
merge med master
src/components/map/map.ts