Merge branch 'main' into man0s/indexer-crossbar-fix

mrgnlabs · Oct 20, 2024 · 56a2c75 · 56a2c75
2 parents 64c5288 + d61516c
commit 56a2c75
Show file tree

Hide file tree

Showing 5 changed files with 749 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,4 @@ test-ledger/
 
 # Allow specific json files
 !tests/fixtures/**/*.json
-!programs/marginfi/tests/fixtures/**/*.json
+!programs/marginfi/tests/fixtures/**/*.json