LogalDeveloper/owncast
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/develop' into webv2

Browse Source
This commit is contained in:
Gabe Kangas
2022-12-15 12:07:09 -08:00
parent 7165e2a9fb 7aeb138adf
commit 0d1684c1e0
9 changed files with 126 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
go.mod
View File

@@ -4,7 +4,7 @@ go 1.18
require (
github.com/amalfra/etag v1.0.0
github.com/aws/aws-sdk-go v1.44.145
github.com/aws/aws-sdk-go v1.44.160
github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f
github.com/go-fed/httpsig v1.1.0
github.com/go-ole/go-ole v1.2.6 // indirect
@@ -22,7 +22,7 @@ require (
github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569
github.com/yuin/goldmark v1.5.3
golang.org/x/mod v0.7.0
golang.org/x/time v0.2.0
golang.org/x/time v0.3.0
mvdan.cc/xurls v1.1.0
)
@@ -31,12 +31,12 @@ require (
github.com/lestrrat-go/strftime v1.0.4 // indirect
github.com/mvdan/xurls v1.1.0 // indirect
github.com/pkg/errors v0.9.1
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/net v0.2.0
golang.org/x/sys v0.2.0 // indirect
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0 // indirect
)
require github.com/prometheus/client_golang v1.14.0
@@ -51,13 +51,13 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/text v0.5.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
)
require (
github.com/nakabonne/tstorage v0.3.5
github.com/shirou/gopsutil/v3 v3.22.10
github.com/shirou/gopsutil/v3 v3.22.11
)
require github.com/SherClockHolmes/webpush-go v1.2.0