Merge branch 'staging' into add-lending-pond-showcase

cardano-foundation · Sep 27, 2022 · 83ed91c · 83ed91c
2 parents 1d835e3 + 7d2b0af
commit 83ed91c
Show file tree

Hide file tree

Showing 191 changed files with 2,771 additions and 1,774 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,8 +38,9 @@ yarn-error.log*
 # intellij
 .idea
 
-# Auto generated content like CIPs, Rust Library and Token Registry
+# Auto generated content like CIPs, Rust Library, Token Registry and Changelog
 /docs/governance/cardano-improvement-proposals/*
 /static/img/cip/*
 /docs/native-tokens/token-registry/*
 /docs/get-started/cardano-serialization-lib/*
+**/changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md