Merge branch 'main' into sandman7920/main

2023-11-18 06:28:48 -05:00
parent 1aa82ff06a b65044712b
commit f64dbcb6b2
95 changed files with 2394 additions and 1023 deletions
--- a/user/manager_test.go
+++ b/user/manager_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stripe/stripe-go/v74"
 	"golang.org/x/crypto/bcrypt"
-	"heckel.io/ntfy/util"
+	"heckel.io/ntfy/v2/util"
 	"net/netip"
 	"path/filepath"
 	"strings"