Merge branch 'master' into feat/layer0

# Conflicts:
#	.gitignore
This commit is contained in:
Sam Carlton 2021-09-04 15:50:20 -05:00
commit 248c6f09d3
3 changed files with 22 additions and 10 deletions

4
.gitignore vendored
View file

@ -80,6 +80,8 @@ dist
# IDE
.idea
# Layer0 generated build directory
.layer0
# Other
/static/app-list.json
@ -89,5 +91,3 @@ dist
.DS_Store
/static/tailwind.css
/.vscode/snipsnap.code-snippets
# Layer0 generated build directory
.layer0