chore(repo): rebase master into dev so we can keep only one branch

privacy-scaling-explorations · Dec 11, 2023 · 228dc90 · 228dc90
1 parent 783f9c8
commit 228dc90
Show file tree

Hide file tree

Showing 29 changed files with 2 additions and 3,042 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -2,7 +2,7 @@ name: Checks
 
 on:
   push:
-    branches: [master, dev]
+    branches: [dev]
   pull_request:
 
 concurrency:

diff --git a/.github/workflows/circuit-build.yml b/.github/workflows/circuit-build.yml
@@ -2,7 +2,7 @@ name: Circuit
 
 on:
   push:
-    branches: [master, dev]
+    branches: [dev]
   pull_request:
 
 concurrency:

diff --git a/cli/test.sh b/cli/test.sh
diff --git a/contracts/docs/DomainObjs.md b/contracts/docs/DomainObjs.md
diff --git a/contracts/docs/HasherBenchmarks.md b/contracts/docs/HasherBenchmarks.md
diff --git a/contracts/docs/IMACI.md b/contracts/docs/IMACI.md