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)
1  2 
src/components/map/map.ts

Simple merge