Merge branch 'develop' into feature/my-profile-endpoint

2022-08-01 10:54:15 +02:00
parent d49232a37b 089f4846d9
commit ab68a07459
29 changed files with 517 additions and 244 deletions
--- a/core/core.go
+++ b/core/core.go
@@ -7,12 +7,12 @@ import (

 	"github.com/safing/portbase/modules"
 	"github.com/safing/portbase/modules/subsystems"
-	"github.com/safing/portmaster/updates"
 	_ "github.com/safing/portmaster/broadcasts"
 	_ "github.com/safing/portmaster/netenv"
 	_ "github.com/safing/portmaster/netquery"
 	_ "github.com/safing/portmaster/status"
 	_ "github.com/safing/portmaster/ui"
+	"github.com/safing/portmaster/updates"
 )

 const (