Jens Langhammer 1005f341e4 Merge branch 'master' into inbuilt-proxy ...

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	internal/constants/constants.go
#	outpost/pkg/version.go

2021-06-23 20:41:06 +02:00

..

config.go

root: allow loading local /static files without debug flag

2021-06-21 21:21:35 +02:00

struct.go

Merge branch 'master' into inbuilt-proxy

2021-06-23 20:41:06 +02:00