merge with master
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 10 Dec 2015 18:53:59 +0000 (19:53 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 10 Dec 2015 18:53:59 +0000 (19:53 +0100)
commit5f5b7db1fbe8413d32bdc9eb8f115472f2d6be34
tree50db6a975923eccc208dce8c277667ce6394e649
parentd10306026f43f293a968070e2b2b6b2ed8c16419
parentb9b9539b70873c78bb894f306a1dc60d3708b5e4
merge with  master
src/components/map/map.ts