[showdetails]merged master itno showdetails
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 12:48:29 +0000 (13:48 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Thu, 3 Dec 2015 12:48:29 +0000 (13:48 +0100)
1  2 
src/components/map/map.ts

Simple merge