Merge branch 'master' into fix/first-redeem

yieldprotocol · May 8, 2023 · 604d398 · 604d398
2 parents 5146d07 + 1d1602a
commit 604d398
Show file tree

Hide file tree

Showing 34 changed files with 11,802 additions and 3,328 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -11,3 +11,6 @@
 [submodule "lib/dss-interfaces"]
 	path = lib/dss-interfaces
 	url = https://github.com/makerdao/dss-interfaces
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts