Merge branch 'master' into develop

matzf · matzf · commit 00775c294732 · 2022-01-05T16:09:31.000+01:00
diff --git a/webapp/lib/sciond.go b/webapp/lib/sciond.go
@@ -42,7 +42,7 @@ import (
 	. "github.com/netsec-ethz/scion-apps/webapp/util"
 )
 
-// Configuations to save. Zeroing out any of these placeholders will cause the
+// Configurations to save. Zeroing out any of these placeholders will cause the
 // webserver to request a fresh external copy to keep locally.
 var cConfig string
 var cLabels string

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ import (`
`42`	`42`	`. "github.com/netsec-ethz/scion-apps/webapp/util"`
`43`	`43`	`)`
`44`	`44`
`45`		`-// Configuations to save. Zeroing out any of these placeholders will cause the`
	`45`	`+// Configurations to save. Zeroing out any of these placeholders will cause the`
`46`	`46`	`// webserver to request a fresh external copy to keep locally.`
`47`	`47`	`var cConfig string`
`48`	`48`	`var cLabels string`