]> git.sur5r.net Git - contagged/commit - scripts/gui.js
Merge commit '4bddd2bb3ff5fd3eec8886302a01dc8191ae1465' into cweiske
authorAndreas Gohr <gohr@cosmocode.de>
Tue, 26 Aug 2014 09:39:59 +0000 (11:39 +0200)
committerAndreas Gohr <gohr@cosmocode.de>
Tue, 26 Aug 2014 09:39:59 +0000 (11:39 +0200)
commitf761878d5f31fe5b1b53215391565d2262cf162e
tree167bf2625e20f8d34983e40892dd495088ae2fa3
parent80bfe0c989b5884d0133e99c36ccad7197105593
parent4bddd2bb3ff5fd3eec8886302a01dc8191ae1465
Merge commit '4bddd2bb3ff5fd3eec8886302a01dc8191ae1465' into cweiske

This is a fake merge, ignoring the commit

* commit '4bddd2bb3ff5fd3eec8886302a01dc8191ae1465':
  Use leafletjs + OpenStreetMap instead of google maps