Merge branch 'master' into file_uploads

Add .gitattributes to force LF line endings
2023-05-05 12:19:55 -05:00 · 2023-05-05 12:19:17 -05:00 · 2023-05-04 09:00:53 -05:00 · 2023-05-04 09:00:35 -05:00
3 changed files with 7 additions and 6 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+* text=auto eol=lf
--- a/go.mod
+++ b/go.mod
@ -3,6 +3,6 @@ module GoWeb
 go 1.20

 require (
-	github.com/lib/pq v1.10.7
-	golang.org/x/crypto v0.7.0
+	github.com/lib/pq v1.10.9
+	golang.org/x/crypto v0.8.0
 )
--- a/go.sum
+++ b/go.sum
@ -1,4 +1,4 @@
-github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
-github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
Author	SHA1	Message	Date
Maximilian	37391190fb	Merge branch 'master' into file_uploads	2023-05-05 12:19:55 -05:00
Maximilian	6da7d408f9	Add .gitattributes to force LF line endings	2023-05-05 12:19:17 -05:00
max	1fb8fdef81	Merge branch 'master' into file_uploads	2023-05-04 09:00:53 -05:00
max	e993bcf317	Update dependency versions	2023-05-04 09:00:35 -05:00