Merge branch 'master' into mautrix-appservice-0.3.0

This commit is contained in:
Tulir Asokan
2018-07-15 00:15:30 +03:00
8 changed files with 122 additions and 38 deletions

1
.gitignore vendored
View File

@@ -7,4 +7,5 @@ __pycache__
config.yaml
registration.yaml
logs/
*.db