chore(repo): rebase master into dev and amend CI

privacy-scaling-explorations · Dec 11, 2023 · 0d7b99c · 0d7b99c
1 parent 60f66ad
commit 0d7b99c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 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/website/versioned_docs/version-v0.x/faq.md b/website/versioned_docs/version-v0.x/faq.md
@@ -54,7 +54,7 @@ Each user should be allowed to publish at no cost as many messages as there are
 1. It is impossible for a coordinator to find a collision in message decryptions. i.e. they cannot decrypt a message to a different command.
 2. It is impossible for a user to create a message that the coordinator is not able to process.
 3. It is impossible for a user to create a message such that the coordinator is unable to create a zk-SNARK proof of a state root transition.
-4. No-one but the coordinator can trustlessly bribe someone. 
+4. No-one but the coordinator can trustlessly bribe someone.
 
 ## III: Desired features not described in this specification