unknown 26014b0c34 Merge branch 'develop' into frank-dev2 ... # Conflicts: # cmd/server/server.go # templates/index.html		2020-12-14 10:38:06 +01:00
..
chart.js	get static folder from frank-dev	2020-12-08 13:30:12 +01:00
hike.geo.json	get static folder from frank-dev	2020-12-08 13:30:12 +01:00
map.js	add legent to the map	2020-12-10 16:47:52 +01:00
websocket.js	Merge branch 'develop' into frank-dev2	2020-12-14 10:38:06 +01:00