Merge branch 'main' into marneu-main

This commit is contained in:
Donald Zou
2021-12-19 18:18:45 -05:00
committed by GitHub

4
.gitignore vendored
View File

@@ -12,4 +12,6 @@ src/static/pic.xd
*.conf *.conf
private_key.txt private_key.txt
public_key.txt public_key.txt
venv/** venv/**
log/**
*~