Merge branch 'main' into szg251/tx-info

mlabs-haskell · Jun 24, 2024 · 1cd6b41 · 1cd6b41
2 parents 7715618 + de770f9
commit 1cd6b41
Show file tree

Hide file tree

Showing 4 changed files with 716 additions and 19 deletions.
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
@@ -21,6 +21,7 @@
 - [Codegen](codegen.md)
 - [Command line interface](command-line-interface.md)
 - [Comparison matrix](comparison-matrix.md)
+- [Aiken Research Document](aiken-integration.md)
 - [Catalyst reports](catalyst-reports.md)
   - [Catalyst 9 reports](catalyst09-reports/README.md)
     - [Milestone 1: Research](catalyst09-reports/milestone-1.md)
@@ -30,3 +31,4 @@
   - [Catalyst 10 reports](catalyst10-reports/README.md)
     - [Milestone 1: Rust support](catalyst10-reports/milestone-1.md)
     - [Milestone 2: Javascript/Typescript support](catalyst10-reports/milestone-2.md)
+    - [Milestone 3: Aiken integration research and development](catalyst10-reports/milestone-3.md)