Commit Graph

2 Commits

Author SHA1 Message Date
26014b0c34 Merge branch 'develop' into frank-dev2
# Conflicts:
#	cmd/server/server.go
#	templates/index.html
2020-12-14 10:38:06 +01:00
40216f11b3 wired webhandler up 2020-12-13 02:52:19 +01:00