Merge branch 'master' of linz:/srv/git/lantea
authorRobert Kaiser <kairo@kairo.at>
Mon, 7 Mar 2016 01:24:00 +0000 (02:24 +0100)
committerRobert Kaiser <kairo@kairo.at>
Mon, 7 Mar 2016 01:24:00 +0000 (02:24 +0100)
1  2 
js/map.js

diff --cc js/map.js
Simple merge