Merge branch 'main' into bnewbold/test-capture

Manually resolved conficts: automod/engine_test.go automod/rules/fixture_test.go
bluesky-social · Dec 14, 2023 · 6e13b3d · 6e13b3d
2 parents 02aa19c + 7d7e1f1
commit 6e13b3d
Show file tree

Hide file tree

Showing 46 changed files with 1,663 additions and 211 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ test-coverage.out
 /sonar-cli
 /stress
 /supercollider
+/hepa
 
 # Don't ignore this file itself, or other specific dotfiles
 !.gitignore

diff --git a/api/atproto/admindeleteAccount.go b/api/atproto/admindeleteAccount.go
diff --git a/api/atproto/cbor_gen.go b/api/atproto/cbor_gen.go
diff --git a/api/atproto/servercreateSession.go b/api/atproto/servercreateSession.go
diff --git a/api/atproto/serverrefreshSession.go b/api/atproto/serverrefreshSession.go
diff --git a/api/atproto/temppushBlob.go b/api/atproto/temppushBlob.go
diff --git a/api/atproto/temptransferAccount.go b/api/atproto/temptransferAccount.go