Merge branch 'master' into updates-1.34.0

This commit is contained in:
Jake Swenson 2020-09-10 11:59:51 -07:00 committed by GitHub
commit f222f7cdce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

3
.gitignore vendored
View File

@ -4,4 +4,5 @@ obj/
*.dll
*.pem
.vscode/
*.pfx
*.pfx
*.cert